do not yaml simple values

This commit is contained in:
Felix Kunde 2019-05-22 12:45:34 +02:00
parent 8af2e6b350
commit 6f0b6752fc
3 changed files with 11 additions and 11 deletions

View File

@ -9,12 +9,12 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
data:
pod_service_account_name: {{ template "postgres-operator.fullname" . }}
docker_image: {{ toYaml .Values.docker_image }}
debug_logging: "{{ toYaml .Values.configDebug.debug_logging }}"
enable_database_access: "{{ toYaml .Values.configDebug.enable_database_access }}"
repair_period: {{ toYaml .Values.repair_period }}
resync_period: {{ toYaml .Values.resync_period }}
spilo_privileged: "{{ toYaml .Values.spilo_privileged }}"
docker_image: {{ .Values.docker_image }}
debug_logging: "{{ .Values.configDebug.debug_logging }}"
enable_database_access: "{{ .Values.configDebug.enable_database_access }}"
repair_period: {{ .Values.repair_period }}
resync_period: {{ .Values.resync_period }}
spilo_privileged: "{{ .Values.spilo_privileged }}"
{{ toYaml .Values.configMap | indent 2 }}
{{ toYaml .Values.configUsers | indent 2 }}
{{ toYaml .Values.configKubernetes | indent 2 }}

View File

@ -9,14 +9,14 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
configuration:
pod_service_account_name: operator
docker_image: {{ toYaml .Values.docker_image }}
repair_period: {{ toYaml .Values.repair_period }}
resync_period: {{ toYaml .Values.resync_period }}
docker_image: {{ .Values.docker_image }}
repair_period: {{ .Values.repair_period }}
resync_period: {{ .Values.resync_period }}
{{ toYaml .Values.configCRD | indent 2 }}
users:
{{ toYaml .Values.configUsers | indent 4 }}
kubernetes:
spilo_privileged: {{ toYaml .Values.spilo_privileged }}
spilo_privileged: {{ .Values.spilo_privileged }}
{{ toYaml .Values.configKubernetes | indent 4 }}
{{ toYaml .Values.configKubernetesCRD | indent 4 }}
postgres_pod_resources:

View File

@ -1,7 +1,7 @@
image:
registry: registry.opensource.zalan.do
repository: acid/postgres-operator
tag: v1.1.0-20-g25e02ad
tag: v1.1.0-35-g8af2e6b-dirty
pullPolicy: "IfNotPresent"
# Optionally specify an array of imagePullSecrets.