From 1664403036ce2568fbf7fec8defb7e3b36e547bd Mon Sep 17 00:00:00 2001
From: matthias <matthias@swobblmail.eu>
Date: Mon, 15 Jul 2024 14:05:16 +0200
Subject: [PATCH 1/3] v0.7.0
---
.../configure_users_and_databases/postgres.yaml | 2 +-
cluster-tutorials/high-availability-cluster/ha-postgres.yaml | 2 +-
cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml | 4 ++--
cluster-tutorials/monitored_cluster/postgres.yaml | 4 ++--
cluster-tutorials/pgbackrest_with_pvc/postgres.yaml | 4 ++--
cluster-tutorials/pgbackrest_with_s3/postgres.yaml | 4 ++--
cluster-tutorials/prepared_databases/postgres.yaml | 2 +-
cluster-tutorials/restore/postgres.yaml | 4 ++--
cluster-tutorials/single-cluster/postgres.yaml | 2 +-
.../templates/postgresql-operator-configuration.yaml | 2 +-
setup/helm/operator/values.yaml | 5 +++--
11 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/cluster-tutorials/configure_users_and_databases/postgres.yaml b/cluster-tutorials/configure_users_and_databases/postgres.yaml
index 881cc3b..9cfd720 100644
--- 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.3-1'
numberOfInstances: 1
postgresql:
version: '16'
diff --git a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
index a4a42c8..eaaf5fc 100644
--- 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.3-1'
numberOfInstances: 2
postgresql:
version: '16'
diff --git a/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml b/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
index 663cbeb..690f8b8 100644
--- 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.3-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.22-1'
mode: transaction
numberOfInstances: 2
resources:
diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml
index 65550f3..4a3b2c1 100644
--- 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.3-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.3-1'
diff --git a/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml b/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml
index 1255a86..2e29f2a 100644
--- 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.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.3-1
repos:
- name: repo1
schedule:
diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
index f55bf05..20abd32 100644
--- 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.3-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.3-1
repos:
- endpoint: YOUR_S3_ENDPOINT
name: repo1
diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml
index 9539b11..f8cb6ad 100644
--- 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.3-1'
numberOfInstances: 1
postgresql:
version: '16'
diff --git a/cluster-tutorials/restore/postgres.yaml b/cluster-tutorials/restore/postgres.yaml
index 9ff8ef6..641af3a 100644
--- 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.3-1
repos:
- name: repo1
schedule:
diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml
index 2e3b602..a9d5f29 100644
--- 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.3-1'
numberOfInstances: 1
postgresql:
version: '16'
diff --git a/setup/helm/operator/templates/postgresql-operator-configuration.yaml b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
index 314e412..0fe1597 100644
--- 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
index 16a7666..8229bcd 100644
--- 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.0-1'
+ postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
+ poolerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.22-1'
watched_namespace: '*'
enable_pod_antiaffinity: 'true'
operator_namespace: 'cpo'
From e81e863ef20b99aa1ae70482e89111472966441d Mon Sep 17 00:00:00 2001
From: matthias <matthias@swobblmail.eu>
Date: Mon, 15 Jul 2024 14:06:46 +0200
Subject: [PATCH 2/3] v0.7.0
---
setup/helm/operator/crds/postgresql.crd.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/setup/helm/operator/crds/postgresql.crd.yaml b/setup/helm/operator/crds/postgresql.crd.yaml
index b162a9c..83b1f49 100644
--- 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
From 4d06ce0a9db43f18d81001919a3e739bb9d2f2c7 Mon Sep 17 00:00:00 2001
From: matthias <matthias@swobblmail.eu>
Date: Mon, 15 Jul 2024 14:37:39 +0200
Subject: [PATCH 3/3] pooler updated
---
.../loadbalancer-cluster/lb-postgres.yaml | 2 ++
.../public-beta-pg17/postgres.yaml | 20 +++++++++++++++++++
2 files changed, 22 insertions(+)
create mode 100644 cluster-tutorials/public-beta-pg17/postgres.yaml
diff --git a/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml b/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
index 690f8b8..056e9d1 100644
--- a/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
+++ b/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
@@ -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/public-beta-pg17/postgres.yaml b/cluster-tutorials/public-beta-pg17/postgres.yaml
new file mode 100644
index 0000000..4d11d27
--- /dev/null
+++ b/cluster-tutorials/public-beta-pg17/postgres.yaml
@@ -0,0 +1,20 @@
+apiVersion: cpo.opensource.cybertec.at/v1
+kind: postgresql
+metadata:
+ name: publicbeta-cluster-1
+spec:
+ dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17beta2-1'
+ numberOfInstances: 1
+ postgresql:
+ version: '17'
+ resources:
+ limits:
+ cpu: 500m
+ memory: 500Mi
+ requests:
+ cpu: 500m
+ memory: 500Mi
+ teamId: acid
+ volume:
+ size: 5Gi
+ #storageClass: default-provisioner