From 7b5fe73382c15332099d4d625d985090c6189a58 Mon Sep 17 00:00:00 2001 From: Rafia Sabih Date: Wed, 30 Jun 2021 18:24:30 +0200 Subject: [PATCH] add config flag to more places --- charts/postgres-operator/values.yaml | 1 + manifests/configmap.yaml | 2 +- manifests/postgresql-operator-default-configuration.yaml | 1 + pkg/controller/operator_config.go | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index c961cbc3d..e7d0acf73 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -97,6 +97,7 @@ configKubernetes: # - deployment-time # - downscaler/* + # enable_cross_namespace_secret: "false" # enables initContainers to run actions before Spilo is started enable_init_containers: true # toggles pod anti affinity on the Postgres pods diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index 972e4fa3b..96072644d 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -36,7 +36,7 @@ data: # downscaler_annotations: "deployment-time,downscaler/*" # enable_admin_role_for_users: "true" # enable_crd_validation: "true" - # enable_cross_namespace_secret: "true" + # enable_cross_namespace_secret: "false" # enable_database_access: "true" enable_ebs_gp3_migration: "false" # enable_ebs_gp3_migration_max_size: "1000" diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index bd6f321dd..e869498ba 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -45,6 +45,7 @@ configuration: # downscaler_annotations: # - deployment-time # - downscaler/* + # enable_cross_namespace_secret: "false" enable_init_containers: true enable_pod_antiaffinity: false enable_pod_disruption_budget: true diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index 761cf1b60..1b9cfba96 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -82,6 +82,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.EnableSidecars = util.CoalesceBool(fromCRD.Kubernetes.EnableSidecars, util.True()) result.SecretNameTemplate = fromCRD.Kubernetes.SecretNameTemplate result.OAuthTokenSecretName = fromCRD.Kubernetes.OAuthTokenSecretName + result.EnableCrossNamespaceSecret = fromCRD.Kubernetes.EnableCrossNamespaceSecret result.InfrastructureRolesSecretName = fromCRD.Kubernetes.InfrastructureRolesSecretName if fromCRD.Kubernetes.InfrastructureRolesDefs != nil {