From 6f0b6752fc0c72ce2a5d253ef0478a557d9a3dd3 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 22 May 2019 12:45:34 +0200 Subject: [PATCH] do not yaml simple values --- charts/postgres-operator/templates/configmap.yaml | 12 ++++++------ .../templates/operatorconfiguration.yaml | 8 ++++---- charts/postgres-operator/values.yaml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/postgres-operator/templates/configmap.yaml b/charts/postgres-operator/templates/configmap.yaml index 962df45ef..8e855f695 100644 --- a/charts/postgres-operator/templates/configmap.yaml +++ b/charts/postgres-operator/templates/configmap.yaml @@ -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 }} diff --git a/charts/postgres-operator/templates/operatorconfiguration.yaml b/charts/postgres-operator/templates/operatorconfiguration.yaml index 84e62d0fb..54e97617a 100644 --- a/charts/postgres-operator/templates/operatorconfiguration.yaml +++ b/charts/postgres-operator/templates/operatorconfiguration.yaml @@ -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: diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index b6f93a8cd..3cdcd4101 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -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.