From 73e3b6305b6fdbb1b5fce1bedde3965f26cf4aa1 Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Mon, 21 Oct 2019 14:48:46 +0200 Subject: [PATCH 1/2] Defaults to operator configuration. --- manifests/kustomization.yaml | 2 +- manifests/postgres-operator.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/kustomization.yaml b/manifests/kustomization.yaml index a39627956..1fa4e3143 100644 --- a/manifests/kustomization.yaml +++ b/manifests/kustomization.yaml @@ -1,6 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- configmap.yaml +- postgresql-operator-default-configuration.yaml - operator-service-account-rbac.yaml - postgres-operator.yaml diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml index 7b74b80a0..bb849712f 100644 --- a/manifests/postgres-operator.yaml +++ b/manifests/postgres-operator.yaml @@ -30,8 +30,8 @@ spec: readOnlyRootFilesystem: true env: # provided additional ENV vars can overwrite individual config map entries - - name: CONFIG_MAP_NAME - value: "postgres-operator" - # In order to use the CRD OperatorConfiguration instead, uncomment these lines and comment out the two lines above - # - name: POSTGRES_OPERATOR_CONFIGURATION_OBJECT - # value: postgresql-operator-default-configuration + - name: POSTGRES_OPERATOR_CONFIGURATION_OBJECT + value: postgresql-operator-default-configuration + # In order to use the ConfigMap instead, uncomment these lines and comment out the two lines above + # - name: CONFIG_MAP_NAME + # value: "postgres-operator" From 41185a973c04ac81ccc5230a6a246aa7dfcec36b Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Mon, 21 Oct 2019 15:45:11 +0200 Subject: [PATCH 2/2] Makes it equal to cm. --- manifests/postgresql-operator-default-configuration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index ad4d028c3..c61e58580 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -35,7 +35,7 @@ configuration: # pod_environment_configmap: "" pod_management_policy: "ordered_ready" pod_role_label: spilo-role - pod_service_account_name: operator + pod_service_account_name: zalando-postgres-operator pod_terminate_grace_period: 5m secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}" # spilo_fsgroup: 103