diff --git a/dev/helm/templates/service.yaml b/dev/helm/templates/service.yaml index 567282e7..d5c9e7a3 100644 --- a/dev/helm/templates/service.yaml +++ b/dev/helm/templates/service.yaml @@ -1,15 +1,23 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "wiki.fullname" . }} - labels: - {{- include "wiki.labels" . | nindent 4 }} + name: {{include "wiki.fullname" .}} + labels: {{- include "wiki.labels" . | nindent 4 }} + {{- with .Values.service.annotations }} + annotations: + {{- range $key, $value := . }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} spec: - type: {{ .Values.service.type }} + type: {{.Values.service.type}} ports: - - port: {{ .Values.service.port }} + - port: {{.Values.service.port}} targetPort: http protocol: TCP name: http - selector: - {{- include "wiki.selectorLabels" . | nindent 4 }} + - port: {{.Values.service.httpsPort}} + targetPort: http + protocol: TCP + name: https + selector: {{- include "wiki.selectorLabels" . | nindent 4}} diff --git a/dev/helm/values.yaml b/dev/helm/values.yaml index e4149df7..2d0859c0 100644 --- a/dev/helm/values.yaml +++ b/dev/helm/values.yaml @@ -35,6 +35,11 @@ securityContext: {} service: type: ClusterIP port: 80 + # Annotations applied for services such as externalDNS or + # service type LoadBalancer + # type: LoadBalancer + # httpsPort: 443 + # annotations: {} ingress: enabled: false @@ -75,7 +80,11 @@ postgresql: ## Set to false if bringing your own PostgreSQL, and set secret value postgresql-uri. ## enabled: true - ### PostgreSQL User to create. + ## PostgreSQL fullname Override + ## Default to wiki-postgresql unless fullname override is set for Chart + ## + fullnameOverride: "" + ## PostgreSQL User to create. ## postgresqlUser: postgres ## PostgreSQL Database to create. @@ -84,6 +93,10 @@ postgresql: ## Persistent Volume Storage configuration. ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes ## + replication: + ## Enable PostgreSQL replication (primary/secondary) + ## + enabled: false persistence: ## Enable PostgreSQL persistence using Persistent Volume Claims. ##