updated to new images and modified gcs

Schmaetz · Schmaetz · commit 3ef953cee1ac · 2024-08-09T15:44:37.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 # exclude some folders
 setup/monitoring
+setup/helm/pgcluster
diff --git a/cluster-tutorials/configure_users_and_databases/postgres.yaml b/cluster-tutorials/configure_users_and_databases/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -23,5 +23,5 @@ spec:
     - createdb
     appl_user:
     - login
-  databases;
+  databases:
     app_db: appl_user
diff --git a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: ha-cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 2
   postgresql:
     version: '16'
diff --git a/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml b/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: ha-cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -15,7 +15,7 @@ spec:
       cpu: 500m
       memory: 500Mi
   connectionPooler:
-    dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.22-rc3'
+    dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.23-1'
     mode: transaction
     numberOfInstances: 2
     resources:
@@ -27,6 +27,8 @@ spec:
         memory: 100Mi
     schema: pooler
     user: pooler
+  enableConnectionPooler: true
+  enableReplicaConnectionPooler: true
   teamId: acid
   volume:
     size: 5Gi
diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -19,4 +19,4 @@ spec:
     size: 5Gi
     #storageClass: default-provisioner
   monitor:
-      image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.3-1-rc2'
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.4-1'
diff --git a/cluster-tutorials/pgbackrest_with_gcs/gcs.conf b/cluster-tutorials/pgbackrest_with_gcs/gcs.conf
@@ -0,0 +1,2 @@
+[global]
+repo1-cipher-pass=YOUR_ENCRYPTION_PASSPHRASE
diff --git a/cluster-tutorials/pgbackrest_with_gcs/kustomization.yaml b/cluster-tutorials/pgbackrest_with_gcs/kustomization.yaml
@@ -0,0 +1,11 @@
+secretGenerator:
+- name: cluster-1-gcs-credentials
+  files:
+  - gcs.conf
+  - gcs.json
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+resources:
+- postgres.yaml
diff --git a/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml b/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
@@ -0,0 +1,36 @@
+apiVersion: cpo.opensource.cybertec.at/v1
+kind: postgresql
+metadata:
+  name: cluster-1
+spec:
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
+  numberOfInstances: 1
+  postgresql:
+    version: '15'
+  resources:
+    limits:
+      cpu: 100m
+      memory: 500Mi
+    requests:
+      cpu: 100m
+      memory: 500Mi
+  teamId: acid
+  volume:
+    size: 5Gi
+  backup:
+    pgbackrest:
+      configuration:
+        secret: cluster-1-gcs-credentials
+      global:
+        repo1-path: /YOUR_PATH_INSIDE_THE_BUCKET/repo1/
+        repo1-retention-full: '7'
+        repo1-retention-full-type: count
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.4-1'
+      repos:
+        - name: repo1
+          resource: cpo-bucket-1
+          key: gcs.json
+          keyType: service
+          schedule:
+            full: 30 2 * * *
+          storage: gcs
diff --git a/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml b/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -24,7 +24,7 @@ spec:
       global:
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1-rc2
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.4-1'
       repos:
         - name: repo1
           schedule:
diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -25,7 +25,7 @@ spec:
         repo1-path: /YOUR_PATH_INSIDE_THE_BUCKET/repo1/
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1-rc2
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.4-1'
       repos:
         - endpoint: YOUR_S3_ENDPOINT
           name: repo1
diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
diff --git a/cluster-tutorials/public-beta-pg17/kustomization.yaml b/cluster-tutorials/public-beta-pg17/kustomization.yaml
@@ -0,0 +1,10 @@
+secretGenerator:
+- name: cluster-1-pvc-configuration
+  files:
+  - pvc.configuration
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+resources:
+- postgres.yaml
diff --git a/cluster-tutorials/public-beta-pg17/postgres.yaml b/cluster-tutorials/public-beta-pg17/postgres.yaml
@@ -0,0 +1,36 @@
+apiVersion: cpo.opensource.cybertec.at/v1
+kind: postgresql
+metadata:
+  name: beta-cluster-1
+spec:
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17beta2-1'
+  numberOfInstances: 1
+  postgresql:
+    version: '17'
+    parameters:
+      shared_preload_libraries: 'pg_stat_statements'
+  resources:
+    limits:
+      cpu: 500m
+      memory: 500Mi
+    requests:
+      cpu: 500m
+      memory: 500Mi
+  teamId: acid
+  volume:
+    size: 5Gi
+  backup:
+    pgbackrest:
+      configuration:
+        secret: cluster-1-pvc-configuration
+      global:
+        repo1-retention-full: '3'
+        repo1-retention-full-type: count
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17beta2-1'
+      repos:
+        - name: repo1
+          schedule:
+            full: 30 2 * * *
+          storage: pvc
+          volume:
+            size: 10Gi
diff --git a/cluster-tutorials/restore/postgres.yaml b/cluster-tutorials/restore/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -24,7 +24,7 @@ spec:
       global:
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1-rc2
+      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.4-1'
       repos:
         - name: repo1
           schedule:
diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
diff --git a/setup/helm/operator/crds/postgresql.crd.yaml b/setup/helm/operator/crds/postgresql.crd.yaml
@@ -505,6 +505,7 @@ spec:
                     - "14"
                     - "15"
                     - "16"
+                    - "17"
                     type: string
                 required:
                 - version
diff --git a/setup/helm/operator/templates/postgresql-operator-configuration.yaml b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
@@ -198,7 +198,7 @@ configuration:
     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-24"
+    connection_pooler_image: {{ .Values.operatorSettings.poolerImage }}
     # connection_pooler_max_db_connections: 60
     connection_pooler_mode: "transaction"
     connection_pooler_number_of_instances: 2
diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml
@@ -15,8 +15,9 @@ imagePullSecretNames: []
 
 # Define the operator settings to add to the configmap
 operatorSettings:
-  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-1-rc2'
-  postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
+  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.1-1'
+  postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
+  poolerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.23-1'
   watched_namespace: '*'
   enable_pod_antiaffinity: 'true'
   operator_namespace: 'cpo'

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`# exclude some folders`
`2`	`2`	`setup/monitoring`
	`3`	`+setup/helm/pgcluster`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[global]`
	`2`	`+repo1-cipher-pass=YOUR_ENCRYPTION_PASSPHRASE`