reflect connectionPool validation in Go code and publish in manifests and chart

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -321,24 +321,6 @@ spec:
             connection_pool:
               type: object
               properties:
-                connection_pool_schema:
-                  type: string
-                  #default: "pooler"
-                connection_pool_user:
-                  type: string
-                  #default: "pooler"
-                connection_pool_instances_number:
-                  type: integer
-                  #default: 1
-                connection_pool_image:
-                  type: string
-                  #default: "pierone.stups.zalan.do/acid/pgbouncer:0.0.1"
-                connection_pool_mode:
-                  type: string
-                  enum:
-                    - "session"
-                    - "transaction"
-                  #default: "transaction"
                 connection_pool_default_cpu_limit:
                   type: string
                   pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
@@ -354,7 +336,25 @@ spec:
                 connection_pool_default_memory_request:
                   type: string
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
-                  #default: "100m"
+                  #default: "100Mi"
+                connection_pool_image:
+                  type: string
+                  #default: "pierone.stups.zalan.do/acid/pgbouncer:0.0.1"
+                connection_pool_instances_number:
+                  type: integer
+                  #default: 1
+                connection_pool_mode:
+                  type: string
+                  enum:
+                    - "session"
+                    - "transaction"
+                  #default: "transaction"
+                connection_pool_schema:
+                  type: string
+                  #default: "pooler"
+                connection_pool_user:
+                  type: string
+                  #default: "pooler"
         status:
           type: object
           additionalProperties:

charts/postgres-operator/templates/configmap.yaml

@@ -20,4 +20,5 @@ data:
 {{ toYaml .Values.configDebug | indent 2 }}
 {{ toYaml .Values.configLoggingRestApi | indent 2 }}
 {{ toYaml .Values.configTeamsApi | indent 2 }}
+{{ toYaml .Values.configConnectionPool | indent 2 }}
 {{- end }}

charts/postgres-operator/templates/operatorconfiguration.yaml

@@ -34,4 +34,6 @@ configuration:
 {{ toYaml .Values.configLoggingRestApi | indent 4 }}
   scalyr:
 {{ toYaml .Values.configScalyr | indent 4 }}
+  connection_pool:
+{{ toYaml .Values.configConnectionPool | indent 4 }}
 {{- end }}

charts/postgres-operator/values-crd.yaml

@@ -261,6 +261,17 @@ configScalyr:
   # Memory request value for the Scalyr sidecar
   scalyr_memory_request: 50Mi
 
+configConnectionPool:
+    connection_pool_default_cpu_limit: "1"
+    connection_pool_default_cpu_request: "1"
+    connection_pool_default_memory_limit: 100m
+    connection_pool_default_memory_request: "100Mi"
+    # connection_pool_image: ""
+    connection_pool_instances_number: 1
+    connection_pool_mode: "transaction"
+    # connection_pool_schema: "pooler"
+    # connection_pool_user: "pooler"
+
 rbac:
   # Specifies whether RBAC resources should be created
   create: true

charts/postgres-operator/values.yaml

@@ -237,6 +237,18 @@ configTeamsApi:
   # URL of the Teams API service
   # teams_api_url: http://fake-teams-api.default.svc.cluster.local
 
+# configure connection pooler deployment created by the operator
+configConnectionPool:
+  connection_pool_default_cpu_limit: "1"
+  connection_pool_default_cpu_request: "1"
+  connection_pool_default_memory_limit: 100m
+  connection_pool_default_memory_request: "100Mi"
+  # connection_pool_image: ""
+  connection_pool_instances_number: 1
+  connection_pool_mode: "transaction"
+  # connection_pool_schema: "pooler"
+  # connection_pool_user: "pooler"
+
 rbac:
   # Specifies whether RBAC resources should be created
   create: true