raise pooler image and fix pgversion config in chart (zalando#1253)

FxKu · web-flow · commit 028f23eec748 · 2020-12-14T12:37:09.000+01:00
* raise pooler image and fix pgversion config in chart
* enable_ebs_gp3_migration_max_size with quotes
* set ConnectionPoolerMinInstances to 1
diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/charts/postgres-operator/crds/operatorconfigurations.yaml
@@ -69,6 +69,8 @@ spec:
                 type: boolean
               enable_lazy_spilo_upgrade:
                 type: boolean
+              enable_pgversion_env_var:
+                type: boolean
               enable_shm_volume:
                 type: boolean
               etcd_host:
diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml
@@ -22,7 +22,7 @@ configGeneral:
   # update only the statefulsets without immediately doing the rolling update
   enable_lazy_spilo_upgrade: false
   # set the PGVERSION env var instead of providing the version via postgresql.bin_dir in SPILO_CONFIGURATION
-  enable_pgversion_env_var: "false"
+  enable_pgversion_env_var: false
   # start any new database pod without limitations on shm memory
   enable_shm_volume: true
   # etcd connection string for Patroni. Empty uses K8s-native DCS.
@@ -270,7 +270,7 @@ configTeamsApi:
   # operator watches for PostgresTeam CRs to assign additional teams and members to clusters
   enable_postgres_team_crd: false
   # toogle to create additional superuser teams from PostgresTeam CRs
-  # enable_postgres_team_crd_superusers: "false"
+  # enable_postgres_team_crd_superusers: false
 
   # toggle to grant superuser to team members created from the Teams API
   enable_team_superuser: false
diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml
@@ -217,7 +217,7 @@ configAwsOrGcp:
   # enable automatic migration on AWS from gp2 to gp3 volumes
   enable_ebs_gp3_migration: "false"
   # defines maximum volume size in GB until which auto migration happens
-  # enable_ebs_gp3_migration_max_size: 1000
+  # enable_ebs_gp3_migration_max_size: "1000"
 
   # GCP credentials for setting the GOOGLE_APPLICATION_CREDNETIALS environment variable
   # gcp_credentials: ""
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
@@ -15,7 +15,7 @@ data:
   # connection_pooler_default_cpu_request: "500m"
   # connection_pooler_default_memory_limit: 100Mi
   # connection_pooler_default_memory_request: 100Mi
-  connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-11"
+  connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-12"
   # connection_pooler_max_db_connections: 60
   # connection_pooler_mode: "transaction"
   # connection_pooler_number_of_instances: 2
@@ -37,10 +37,11 @@ data:
   # enable_crd_validation: "true"
   # enable_database_access: "true"
   enable_ebs_gp3_migration: "false"
-  # enable_ebs_gp3_migration_max_size: 1000
+  # enable_ebs_gp3_migration_max_size: "1000"
   # enable_init_containers: "true"
   # enable_lazy_spilo_upgrade: "false"
   enable_master_load_balancer: "false"
+  # enable_pgversion_env_var: "false"
   # enable_pod_antiaffinity: "false"
   # enable_pod_disruption_budget: "true"
   # enable_postgres_team_crd: "false"
diff --git a/manifests/minimal-fake-pooler-deployment.yaml b/manifests/minimal-fake-pooler-deployment.yaml
@@ -23,7 +23,7 @@ spec:
       serviceAccountName: postgres-operator
       containers:
       - name: postgres-operator
-        image: registry.opensource.zalan.do/acid/pgbouncer:master-11
+        image: registry.opensource.zalan.do/acid/pgbouncer:master-12
         imagePullPolicy: IfNotPresent
         resources:
           requests:
diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml
@@ -6,6 +6,7 @@ configuration:
   docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p3
   # enable_crd_validation: true
   # enable_lazy_spilo_upgrade: false
+  # enable_pgversion_env_var: false
   # enable_shm_volume: true
   etcd_host: ""
   # kubernetes_use_configmaps: false
diff --git a/pkg/util/constants/pooler.go b/pkg/util/constants/pooler.go
@@ -14,5 +14,5 @@ const (
 	ConnectionPoolerContainer            = 0
 	ConnectionPoolerMaxDBConnections     = 60
 	ConnectionPoolerMaxClientConnections = 10000
-	ConnectionPoolerMinInstances         = 2
+	ConnectionPoolerMinInstances         = 1
 )

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ const (`
`14`	`14`	`ConnectionPoolerContainer = 0`
`15`	`15`	`ConnectionPoolerMaxDBConnections = 60`
`16`	`16`	`ConnectionPoolerMaxClientConnections = 10000`
`17`		`- ConnectionPoolerMinInstances = 2`
	`17`	`+ ConnectionPoolerMinInstances = 1`
`18`	`18`	`)`