Revert images back to main after 2.8.0 release

Makefile

@@ -443,6 +443,9 @@ rm -rf $$TMP_DIR ;\
 }
 endef
 
+update-version:
+	echo $(NEXT_VER) > percona/version/version.txt
+
 # Prepare release
 PG_VER ?= $(shell grep -o "postgresVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+")
 include e2e-tests/release_versions
@@ -469,11 +472,11 @@ MINOR_VER       := $(word 2,$(subst ., ,$(CURRENT_VERSION)))
 NEXT_VER        := $(MAJOR_VER).$(shell expr $(MINOR_VER) + 1).0
 PREV1_VERSION   := $(MAJOR_VER).$(shell expr $(MINOR_VER) - 1).0
 PREV2_VERSION   := $(MAJOR_VER).$(shell expr $(MINOR_VER) - 2).0
-after-release: generate
-	echo $(NEXT_VER) > percona/version/version.txt
+after-release: update-version generate
 	$(SED) -i \
 		-e "/^spec:/,/^  crVersion:/{s/crVersion: .*/crVersion: $(NEXT_VER)/}" \
 		-e "/^spec:/,/^  image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \
+		-e "/initContainer:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main#}" \
 		-e "/^    pgBouncer:/,/^      image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \
 		-e "/^    pgbackrest:/,/^      image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" \
 		-e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main#}" \
@@ -484,6 +487,8 @@ after-release: generate
 		-e "/^spec:/,/^  toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \
 		-e "/^spec:/,/^  toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \
 		-e "/^spec:/,/^  toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" deploy/upgrade.yaml
+
+# Update upgrade-consistency
 	$(SED) -i "s/$(PREV2_VERSION)/$(PREV1_VERSION)/g" e2e-tests/tests/upgrade-consistency/01-*.yaml
 	$(SED) -i "s/$(PREV1_VERSION)/$(CURRENT_VERSION)/g" e2e-tests/tests/upgrade-consistency/02-*.yaml
 	$(SED) -i "s/$(CURRENT_VERSION)/$(NEXT_VER)/g" e2e-tests/tests/upgrade-consistency/03-*.yaml e2e-tests/tests/init-deploy/05-assert.yaml

config/bundle/kustomization.yaml

@@ -6,5 +6,5 @@ resources:
 - ../manager/namespace
 images:
 - name: postgres-operator
-  newName: docker.io/percona/percona-postgresql-operator
-  newTag: 2.8.0
+  newName: docker.io/perconalab/percona-postgresql-operator
+  newTag: main

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.8.0
+    pgv2.percona.com/version: v2.9.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.8.0
+    pgv2.percona.com/version: v2.9.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.8.0
+    pgv2.percona.com/version: v2.9.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.8.0
+    pgv2.percona.com/version: v2.9.0

config/cw-bundle/kustomization.yaml

@@ -7,5 +7,5 @@ resources:
 
 images:
 - name: postgres-operator
-  newName: docker.io/percona/percona-postgresql-operator
-  newTag: 2.8.0
+  newName: docker.io/perconalab/percona-postgresql-operator
+  newTag: main

config/manager/cluster/kustomization.yaml

@@ -8,5 +8,5 @@ patchesStrategicMerge:
 
 images:
 - name: postgres-operator
-  newName: docker.io/percona/percona-postgresql-operator
-  newTag: 2.8.0
+  newName: docker.io/perconalab/percona-postgresql-operator
+  newTag: main

config/manager/namespace/kustomization.yaml

@@ -9,5 +9,5 @@ patchesStrategicMerge:
 
 images:
 - name: postgres-operator
-  newName: docker.io/percona/percona-postgresql-operator
-  newTag: 2.8.0
+  newName: docker.io/perconalab/percona-postgresql-operator
+  newTag: main

deploy/bundle.yaml

@@ -297,7 +297,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgbackups.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -705,7 +705,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgclusters.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -22109,7 +22109,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgrestores.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -22209,7 +22209,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgupgrades.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -53964,7 +53964,7 @@ spec:
           value: "false"
         - name: PGO_WORKERS
           value: "1"
-        image: docker.io/percona/percona-postgresql-operator:2.8.0
+        image: docker.io/perconalab/percona-postgresql-operator:main
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3

deploy/cr.yaml

@@ -9,9 +9,9 @@ metadata:
 #  - percona.com/delete-ssl
 #  - percona.com/delete-backups
 spec:
-  crVersion: 2.8.0
+  crVersion: 2.9.0
 #  initContainer:
-#    image: docker.io/percona/percona-postgresql-operator:2.8.0
+#    image: docker.io/perconalab/percona-postgresql-operator:main
 #    resources:
 #      limits:
 #        cpu: 2.0
@@ -154,7 +154,7 @@ spec:
 #          test-label: value
 
 
-  image: docker.io/percona/percona-distribution-postgresql:17.6-1
+  image: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres
   imagePullPolicy: Always
   postgresVersion: 17
 #  port: 5432
@@ -188,7 +188,7 @@ spec:
 #    - secretRef:
 #        name: instance-env-secret
 #    initContainer:
-#      image: docker.io/percona/percona-postgresql-operator:2.8.0
+#      image: docker.io/perconalab/percona-postgresql-operator:main
 #      resources:
 #        limits:
 #          cpu: 2.0
@@ -312,7 +312,7 @@ spec:
   proxy:
     pgBouncer:
       replicas: 3
-      image: docker.io/percona/percona-pgbouncer:1.24.1-1
+      image: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer17
 #      env:
 #      - name: MY_ENV
 #        value: "1000"
@@ -409,15 +409,15 @@ spec:
     pgbackrest:
 #      metadata:
 #        labels:
-      image: docker.io/percona/percona-pgbackrest:2.56.0-1
+      image: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17
 #      env:
 #      - name: MY_ENV
 #        value: "1000"
 #      envFrom:
 #      - secretRef:
 #          name: repo-host-env-secret
 #      initContainer:
-#        image: docker.io/percona/percona-postgresql-operator:2.8.0
+#        image: docker.io/perconalab/percona-postgresql-operator:main
 #        resources:
 #          limits:
 #            cpu: 2.0
@@ -613,7 +613,7 @@ spec:
 
   pmm:
     enabled: false
-    image: docker.io/percona/pmm-client:3.4.1
+    image: docker.io/perconalab/pmm-client:dev-latest
 #    imagePullPolicy: IfNotPresent
     secret: cluster1-pmm-secret
     serverHost: monitoring-service
@@ -647,7 +647,7 @@ spec:
 #    - basebackup
 
 #  extensions:
-#    image: docker.io/percona/percona-postgresql-operator:2.8.0
+#    image: docker.io/perconalab/percona-postgresql-operator:main
 #    imagePullPolicy: Always
 #    storage:
 #      type: s3

deploy/crd.yaml

@@ -297,7 +297,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgbackups.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -705,7 +705,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgclusters.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -22109,7 +22109,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgrestores.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -22209,7 +22209,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.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.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgbackups.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -705,7 +705,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgclusters.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -22109,7 +22109,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgrestores.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -22209,7 +22209,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
-    pgv2.percona.com/version: v2.8.0
+    pgv2.percona.com/version: v2.9.0
   name: perconapgupgrades.pgv2.percona.com
 spec:
   group: pgv2.percona.com
@@ -53962,7 +53962,7 @@ spec:
           value: "false"
         - name: PGO_WORKERS
           value: "1"
-        image: docker.io/percona/percona-postgresql-operator:2.8.0
+        image: docker.io/perconalab/percona-postgresql-operator:main
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3

deploy/cw-operator.yaml

@@ -44,7 +44,7 @@ spec:
           value: "false"
         - name: PGO_WORKERS
           value: "1"
-        image: docker.io/percona/percona-postgresql-operator:2.8.0
+        image: docker.io/perconalab/percona-postgresql-operator:main
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3

deploy/operator.yaml

@@ -47,7 +47,7 @@ spec:
           value: "false"
         - name: PGO_WORKERS
           value: "1"
-        image: docker.io/percona/percona-postgresql-operator:2.8.0
+        image: docker.io/perconalab/percona-postgresql-operator:main
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3

deploy/upgrade.yaml

@@ -4,9 +4,9 @@ metadata:
   name: cluster1-16-to-17
 spec:
   postgresClusterName: cluster1
-  image: docker.io/percona/percona-postgresql-operator:2.8.0-upgrade
+  image: docker.io/perconalab/percona-postgresql-operator:main-upgrade
   fromPostgresVersion: 16
   toPostgresVersion: 17
-  toPostgresImage: docker.io/percona/percona-distribution-postgresql:17.6-1
-  toPgBouncerImage: docker.io/percona/percona-pgbouncer:1.24.1-1
-  toPgBackRestImage: docker.io/percona/percona-pgbackrest:2.56.0-1
+  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

e2e-tests/functions

@@ -495,6 +495,18 @@ get_service_ip() {
 	kubectl get service/$service -n "${NAMESPACE}" -o 'jsonpath={.status.loadBalancer.ingress[].hostname}'
 }
 
+get_version_images() {
+	local cr_version="$1"
+	local component="$2"
+	local release_versions_file="${TEMP_DIR}/release_version_${cr_version}"
+
+	if [[ ! -f $release_versions_file ]]; then
+		curl -s "https://raw.githubusercontent.com/percona/percona-postgresql-operator/refs/tags/v${cr_version}/e2e-tests/release_versions" >$release_versions_file
+	fi
+
+	grep -i ${component} $release_versions_file | cut -d'=' -f2
+}
+
 wait_for_delete() {
 	local res="$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.8.0
+    pgv2.percona.com/version: 2.9.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.8.0
+    pgv2.percona.com/version: 2.9.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.8.0
+    pgv2.percona.com/version: 2.9.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.8.0
+    pgv2.percona.com/version: 2.9.0
     postgres-operator.crunchydata.com/cluster: init-deploy
     postgres-operator.crunchydata.com/role: pgbouncer
     test-label: test
@@ -191,7 +191,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.8.0
+    pgv2.percona.com/version: 2.9.0
     postgres-operator.crunchydata.com/cluster: init-deploy
     postgres-operator.crunchydata.com/data: pgbackrest
     postgres-operator.crunchydata.com/pgbackrest: ""
@@ -214,7 +214,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.8.0
+        pgv2.percona.com/version: 2.9.0
         postgres-operator.crunchydata.com/cluster: init-deploy
         postgres-operator.crunchydata.com/data: pgbackrest
         postgres-operator.crunchydata.com/pgbackrest: ""