K8SPG-898 Release 2.9.0

Makefile

@@ -448,22 +448,24 @@ update-version:
 
 # Prepare release
 PG_VER ?= $(shell grep -o "postgresVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+")
+CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
 include e2e-tests/release_versions
 release: generate
+	$(SED) -i "/CERT_MANAGER_VER/s/CERT_MANAGER_VER=\".*/CERT_MANAGER_VER=\"$(CERT_MANAGER_VER)\"/" e2e-tests/functions
 	$(SED) -i \
 		-e "/^spec:/,/^  crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
-		-e "/^spec:/,/^  image:/{/^#/! s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
+		-e "/^spec:/,/^  image:/{/^#/! s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL18)#}" \
 		-e "s|    image: docker.io/perconalab/percona-postgresql-operator:main|    image: $(IMAGE)|" \
-		-e "/^    pgBouncer:/,/^      image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
-		-e "/^    pgbackrest:/,/^      image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" \
+		-e "/^    pgBouncer:/,/^      image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER18)#}" \
+		-e "/^    pgbackrest:/,/^      image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" \
 		-e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_OPERATOR)#}" \
 		-e "/^  pmm:/,/^    image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
 	$(SED) -i -r "/Version *= \"[0-9]+\.[0-9]+\.[0-9]+\"$$/ s/[0-9]+\.[0-9]+\.[0-9]+/$(VERSION)/" pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
 	$(SED) -i \
        -e "/^spec:/,/^  image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_UPGRADE)#}" \
-       -e "/^spec:/,/^  toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
-       -e "/^spec:/,/^  toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
-       -e "/^spec:/,/^  toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" deploy/upgrade.yaml
+       -e "/^spec:/,/^  toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL18)#}" \
+       -e "/^spec:/,/^  toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER18)#}" \
+       -e "/^spec:/,/^  toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" deploy/upgrade.yaml
 
 # Prepare main branch after release
 CURRENT_VERSION := $(shell grep -oE "crVersion: [0-9]+\.[0-9]+\.[0-9]+" deploy/cr.yaml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")

config/crd/patches/versionlabel_in_perconapgbackups.yaml

@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
 metadata:
   name: perconapgbackups.pgv2.percona.com
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0

config/crd/patches/versionlabel_in_perconapgclusters.yaml

@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
 metadata:
   name: perconapgclusters.pgv2.percona.com
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0

config/crd/patches/versionlabel_in_perconapgrestores.yaml

@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
 metadata:
   name: perconapgrestores.pgv2.percona.com
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0

config/crd/patches/versionlabel_in_perconapgupgrade.yaml

@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
 metadata:
   name: perconapgupgrades.pgv2.percona.com
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0

deploy/bundle.yaml

@@ -297,7 +297,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgbackups.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -995,7 +995,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgclusters.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -30140,7 +30140,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgrestores.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -30462,7 +30462,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgupgrades.pgv2.percona.com
 spec:
   group: pgv2.percona.com

deploy/cr.yaml

@@ -9,7 +9,7 @@ metadata:
 #  - percona.com/delete-ssl
 #  - percona.com/delete-backups
 spec:
-  crVersion: 2.9.0
+  crVersion: 2.10.0
 #  clusterServiceDNSSuffix: cluster.local
 #  initContainer:
 #    image: docker.io/perconalab/percona-postgresql-operator:main
@@ -183,9 +183,9 @@ spec:
 #          test-label: value
 
 
-  image: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres
+  image: docker.io/perconalab/percona-postgresql-operator:main-ppg18-postgres
   imagePullPolicy: Always
-  postgresVersion: 17
+  postgresVersion: 18
 #  port: 5432
 
 #  expose:
@@ -366,7 +366,7 @@ spec:
   proxy:
     pgBouncer:
       replicas: 3
-      image: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer17
+      image: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer18
 #      env:
 #      - name: MY_ENV
 #        value: "1000"
@@ -492,7 +492,7 @@ spec:
     pgbackrest:
 #      metadata:
 #        labels:
-      image: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17
+      image: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest18
 #      env:
 #      - name: MY_ENV
 #        value: "1000"

deploy/crd.yaml

@@ -297,7 +297,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgbackups.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -995,7 +995,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgclusters.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -30140,7 +30140,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgrestores.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -30462,7 +30462,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgupgrades.pgv2.percona.com
 spec:
   group: pgv2.percona.com

deploy/cw-bundle.yaml

@@ -297,7 +297,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgbackups.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -995,7 +995,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgclusters.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -30140,7 +30140,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgrestores.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -30462,7 +30462,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.20.0
   labels:
-    pgv2.percona.com/version: v2.9.0
+    pgv2.percona.com/version: v2.10.0
   name: perconapgupgrades.pgv2.percona.com
 spec:
   group: pgv2.percona.com

deploy/upgrade.yaml

@@ -1,12 +1,12 @@
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGUpgrade
 metadata:
-  name: cluster1-16-to-17
+  name: cluster1-17-to-18
 spec:
   postgresClusterName: cluster1
   image: docker.io/perconalab/percona-postgresql-operator:main-upgrade
-  fromPostgresVersion: 16
-  toPostgresVersion: 17
-  toPostgresImage: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres
-  toPgBouncerImage: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer17
-  toPgBackRestImage: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17
+  fromPostgresVersion: 17
+  toPostgresVersion: 18
+  toPostgresImage: docker.io/perconalab/percona-postgresql-operator:main-ppg18-postgres
+  toPgBouncerImage: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer18
+  toPgBackRestImage: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest18

e2e-tests/functions

@@ -2,7 +2,9 @@
 
 # set root repo relatively to a test dir
 ROOT_REPO=${ROOT_REPO:-$(realpath ../../..)}
-CERT_MANAGER_VER="1.19.1"
+CERT_MANAGER_VER="1.20.0"
+CHAOS_MESH_VER="2.5.1"
+BUSYBOX_VER="1.36"
 test_name=$(basename "$(pwd)")
 source "${ROOT_REPO}/e2e-tests/vars.sh"
 
@@ -794,7 +796,7 @@ deploy_chaos_mesh() {
 	destroy_chaos_mesh
 
 	helm repo add chaos-mesh https://charts.chaos-mesh.org
-	helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/run/containerd/containerd.sock --set dashboard.create=false --version 2.5.1
+	helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/run/containerd/containerd.sock --set dashboard.create=false --version ${CHAOS_MESH_VER}
 	if [[ $OPENSHIFT ]]; then
 		oc adm policy add-scc-to-user privileged -z chaos-daemon --namespace=${NAMESPACE}
 	fi
@@ -1536,7 +1538,7 @@ spec:
         - operator: Exists
       containers:
         - name: enable
-          image: busybox:1.36
+          image: busybox:${BUSYBOX_VER}
           securityContext:
             privileged: true
           env:

e2e-tests/release_versions

@@ -1,51 +1,42 @@
-# Images versions
-IMAGE_OPERATOR=percona/percona-postgresql-operator:2.8.2
+IMAGE_OPERATOR=percona/percona-postgresql-operator:2.9.0
 
-IMAGE_POSTGRESQL18=percona/percona-distribution-postgresql:18.1-3
-IMAGE_PGBOUNCER18=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS18=percona/percona-postgresql-operator:2.8.2-ppg18.1-postgres-gis3.5.4
-IMAGE_BACKREST18=percona/percona-pgbackrest:2.57.0-1
+IMAGE_POSTGRESQL14=percona/percona-distribution-postgresql:14.22-1
+IMAGE_PGBOUNCER14=percona/percona-pgbouncer:1.25.1-1
+IMAGE_POSTGIS14=percona/percona-distribution-postgresql-with-postgis:14.22-1
+IMAGE_BACKREST14=percona/percona-pgbackrest:2.58.0-1
 
-IMAGE_POSTGRESQL17=percona/percona-distribution-postgresql:17.7-2
-IMAGE_PGBOUNCER17=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.8.2-ppg17.7-postgres-gis3.3.8
-IMAGE_BACKREST17=percona/percona-pgbackrest:2.57.0-1
+IMAGE_POSTGRESQL15=percona/percona-distribution-postgresql:15.17-1
+IMAGE_PGBOUNCER15=percona/percona-pgbouncer:1.25.1-1
+IMAGE_POSTGIS15=percona/percona-distribution-postgresql-with-postgis:15.17-1
+IMAGE_BACKREST15=percona/percona-pgbackrest:2.58.0-1
 
-IMAGE_POSTGRESQL16=percona/percona-distribution-postgresql:16.11-2
-IMAGE_PGBOUNCER16=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.8.2-ppg16.11-postgres-gis3.3.8
-IMAGE_BACKREST16=percona/percona-pgbackrest:2.57.0-1
+IMAGE_POSTGRESQL16=percona/percona-distribution-postgresql:16.13-1
+IMAGE_PGBOUNCER16=percona/percona-pgbouncer:1.25.1-1
+IMAGE_POSTGIS16=percona/percona-distribution-postgresql-with-postgis:16.13-1
+IMAGE_BACKREST16=percona/percona-pgbackrest:2.58.0-1
 
-IMAGE_POSTGRESQL15=percona/percona-distribution-postgresql:15.15-2
-IMAGE_PGBOUNCER15=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.8.2-ppg15.15-postgres-gis3.3.8
-IMAGE_BACKREST15=percona/percona-pgbackrest:2.57.0-1
+IMAGE_POSTGRESQL17=percona/percona-distribution-postgresql:17.9-1
+IMAGE_PGBOUNCER17=percona/percona-pgbouncer:1.25.1-1
+IMAGE_POSTGIS17=percona/percona-distribution-postgresql-with-postgis:17.9-1
+IMAGE_BACKREST17=percona/percona-pgbackrest:2.58.0-1
 
-IMAGE_POSTGRESQL14=percona/percona-distribution-postgresql:14.20-2
-IMAGE_PGBOUNCER14=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.8.2-ppg14.20-postgres-gis3.3.8
-IMAGE_BACKREST14=percona/percona-pgbackrest:2.57.0-1
+IMAGE_POSTGRESQL18=percona/percona-distribution-postgresql:18.3-1
+IMAGE_PGBOUNCER18=percona/percona-pgbouncer:1.25.1-1
+IMAGE_POSTGIS18=percona/percona-distribution-postgresql-with-postgis:18.3-1
+IMAGE_BACKREST18=percona/percona-pgbackrest:2.58.0-1
 
-IMAGE_POSTGRESQL13=percona/percona-distribution-postgresql:13.23-2
-IMAGE_PGBOUNCER13=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.8.2-ppg13.23-postgres-gis3.3.8
-IMAGE_BACKREST13=percona/percona-pgbackrest:2.57.0-1
-
-IMAGE_UPGRADE=percona/percona-postgresql-operator:2.8.2-upgrade
+IMAGE_UPGRADE=percona/percona-postgresql-operator:2.9.0-upgrade
 
 IMAGE_PMM_CLIENT=percona/pmm-client:2.44.1-1
 IMAGE_PMM_SERVER=percona/pmm-server:2.44.1
-IMAGE_PMM3_CLIENT=percona/pmm-client:3.5.0
-IMAGE_PMM3_SERVER=percona/pmm-server:3.5.0
-
-# Supported k8s versions
-GKE_MIN=1.31
-GKE_MAX=1.33
-EKS_MIN=1.31
-EKS_MAX=1.34
-AKS_MIN=1.32
-AKS_MAX=1.34
-OPENSHIFT_MIN=4.16.51
-OPENSHIFT_MAX=4.20.2
-# MINIKUBE_MAX = k8s version in MINIKUBE
-MINIKUBE_MAX=1.34.0
+IMAGE_PMM3_CLIENT=percona/pmm-client:3.6.0
+IMAGE_PMM3_SERVER=percona/pmm-server:3.6.0
+GKE_MIN=1.32
+GKE_MAX=1.34
+EKS_MIN=1.33
+EKS_MAX=1.35
+AKS_MIN=1.33
+AKS_MAX=1.35
+OPENSHIFT_MIN=4.17.51
+OPENSHIFT_MAX=4.21.6
+MINIKUBE_MAX=1.35.1

e2e-tests/tests/init-deploy/05-assert.yaml

@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/managed-by: percona-postgresql-operator
     app.kubernetes.io/name: percona-postgresql
     app.kubernetes.io/part-of: percona-postgresql
-    pgv2.percona.com/version: 2.9.0
+    pgv2.percona.com/version: 2.10.0
     postgres-operator.crunchydata.com/cluster: init-deploy
     postgres-operator.crunchydata.com/pgbackrest: ""
     postgres-operator.crunchydata.com/pgbackrest-config: ""
@@ -81,7 +81,7 @@ metadata:
     app.kubernetes.io/managed-by: percona-postgresql-operator
     app.kubernetes.io/name: percona-postgresql
     app.kubernetes.io/part-of: percona-postgresql
-    pgv2.percona.com/version: 2.9.0
+    pgv2.percona.com/version: 2.10.0
     postgres-operator.crunchydata.com/cluster: init-deploy
     postgres-operator.crunchydata.com/role: pgbouncer
     test-label: test
@@ -144,7 +144,7 @@ metadata:
     app.kubernetes.io/managed-by: percona-postgresql-operator
     app.kubernetes.io/name: percona-postgresql
     app.kubernetes.io/part-of: percona-postgresql
-    pgv2.percona.com/version: 2.9.0
+    pgv2.percona.com/version: 2.10.0
     postgres-operator.crunchydata.com/cluster: init-deploy
     postgres-operator.crunchydata.com/pgbackrest: ""
     postgres-operator.crunchydata.com/pgbackrest-config: ""
@@ -168,7 +168,7 @@ metadata:
     app.kubernetes.io/managed-by: percona-postgresql-operator
     app.kubernetes.io/name: percona-postgresql
     app.kubernetes.io/part-of: percona-postgresql
-    pgv2.percona.com/version: 2.9.0
+    pgv2.percona.com/version: 2.10.0
     postgres-operator.crunchydata.com/cluster: init-deploy
     postgres-operator.crunchydata.com/role: pgbouncer
     test-label: test
@@ -209,7 +209,7 @@ metadata:
     app.kubernetes.io/managed-by: percona-postgresql-operator
     app.kubernetes.io/name: percona-postgresql
     app.kubernetes.io/part-of: percona-postgresql
-    pgv2.percona.com/version: 2.9.0
+    pgv2.percona.com/version: 2.10.0
     postgres-operator.crunchydata.com/cluster: init-deploy
     postgres-operator.crunchydata.com/data: pgbackrest
     postgres-operator.crunchydata.com/pgbackrest: ""
@@ -232,7 +232,7 @@ spec:
         app.kubernetes.io/managed-by: percona-postgresql-operator
         app.kubernetes.io/name: percona-postgresql
         app.kubernetes.io/part-of: percona-postgresql
-        pgv2.percona.com/version: 2.9.0
+        pgv2.percona.com/version: 2.10.0
         postgres-operator.crunchydata.com/cluster: init-deploy
         postgres-operator.crunchydata.com/data: pgbackrest
         postgres-operator.crunchydata.com/pgbackrest: ""

e2e-tests/tests/major-upgrade-17-to-18/01-create-cluster.yaml

@@ -19,6 +19,7 @@ commands:
           .spec.instances[0].dataVolumeClaimSpec.resources.requests.storage = \"3Gi\" |
           .spec.proxy.pgBouncer.image = \"${pgbouncer_image}\" |
           .spec.backups.pgbackrest.image = \"${pgbackrest_image}\" |
+          .spec.patroni.removeDataDirectoryOnDivergedTimelines = true |
           .spec.patroni.dynamicConfiguration.postgresql.parameters.shared_preload_libraries = \"pg_cron\" |
           .spec.extensions.custom += [{\"name\": \"pg_cron\", \"version\": \"1.6.6\"}]" \
         | kubectl -n "${NAMESPACE}" apply -f -