K8SPG-651 - Update images and versions post-release (#1096)

jvpasinatto · hors · web-flow · commit 38b292d3a94c · 2025-03-18T22:01:46.000+02:00
* K8SPG-651 - Update images and versions post-release

* fix upgrade-minor test

---------

Co-authored-by: Viacheslav Sarzhan &lt;slava.sarzhan@percona.com&gt;
diff --git a/config/bundle/kustomization.yaml b/config/bundle/kustomization.yaml
@@ -6,5 +6,5 @@ resources:
 - ../manager/namespace
 images:
 - name: postgres-operator
-  newName: percona/percona-postgresql-operator
-  newTag: 2.6.0
+  newName: perconalab/percona-postgresql-operator
+  newTag: main
diff --git a/config/cw-bundle/kustomization.yaml b/config/cw-bundle/kustomization.yaml
@@ -7,5 +7,5 @@ resources:
 
 images:
 - name: postgres-operator
-  newName: percona/percona-postgresql-operator
-  newTag: 2.6.0
+  newName: perconalab/percona-postgresql-operator
+  newTag: main
diff --git a/config/manager/cluster/kustomization.yaml b/config/manager/cluster/kustomization.yaml
@@ -8,5 +8,5 @@ patchesStrategicMerge:
 
 images:
 - name: postgres-operator
-  newName: percona/percona-postgresql-operator
-  newTag: 2.6.0
+  newName: perconalab/percona-postgresql-operator
+  newTag: main
diff --git a/config/manager/namespace/kustomization.yaml b/config/manager/namespace/kustomization.yaml
@@ -9,5 +9,5 @@ patchesStrategicMerge:
 
 images:
 - name: postgres-operator
-  newName: percona/percona-postgresql-operator
-  newTag: 2.6.0
+  newName: perconalab/percona-postgresql-operator
+  newTag: main
diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -45993,7 +45993,7 @@ spec:
           value: INFO
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: percona/percona-postgresql-operator:2.6.0
+        image: perconalab/percona-postgresql-operator:main
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -9,7 +9,7 @@ metadata:
 #  - percona.com/delete-ssl
 #  - percona.com/delete-backups
 spec:
-  crVersion: 2.6.0
+  crVersion: 2.7.0
 #  metadata:
 #    annotations:
 #      example-annotation: value
@@ -124,9 +124,9 @@ spec:
 #          test-label: value
 
 
-  image: percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres
+  image: perconalab/percona-postgresql-operator:main-ppg17-postgres
   imagePullPolicy: Always
-  postgresVersion: 16
+  postgresVersion: 17
 #  port: 5432
 
 #  expose:
@@ -240,7 +240,7 @@ spec:
   proxy:
     pgBouncer:
       replicas: 3
-      image: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbouncer1.24.0
+      image: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
 #      exposeSuperusers: true
 #      resources:
 #        limits:
@@ -322,7 +322,7 @@ spec:
     pgbackrest:
 #      metadata:
 #        labels:
-      image: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbackrest2.54.2
+      image: perconalab/percona-postgresql-operator:main-ppg17-pgbackrest
 #
 #      containers:
 #        pgbackrest:
@@ -467,7 +467,7 @@ spec:
 
   pmm:
     enabled: false
-    image: percona/pmm-client:2.44.0
+    image: perconalab/pmm-client:dev-latest
 #    imagePullPolicy: IfNotPresent
     secret: cluster1-pmm-secret
     serverHost: monitoring-service
@@ -489,7 +489,7 @@ spec:
 #          work_mem: 2MB
 
 #  extensions:
-#    image: percona/percona-postgresql-operator:2.6.0
+#    image: perconalab/percona-postgresql-operator:main
 #    imagePullPolicy: Always
 #    storage:
 #      type: s3
diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -45991,7 +45991,7 @@ spec:
           value: INFO
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: percona/percona-postgresql-operator:2.6.0
+        image: perconalab/percona-postgresql-operator:main
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
diff --git a/deploy/cw-operator.yaml b/deploy/cw-operator.yaml
@@ -42,7 +42,7 @@ spec:
           value: INFO
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: percona/percona-postgresql-operator:2.6.0
+        image: perconalab/percona-postgresql-operator:main
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -45,7 +45,7 @@ spec:
           value: INFO
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: percona/percona-postgresql-operator:2.6.0
+        image: perconalab/percona-postgresql-operator:main
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
diff --git a/deploy/upgrade.yaml b/deploy/upgrade.yaml
@@ -4,9 +4,9 @@ metadata:
   name: cluster1-15-to-16
 spec:
   postgresClusterName: cluster1
-  image: percona/percona-postgresql-operator:2.6.0
-  fromPostgresVersion: 15
-  toPostgresVersion: 16
-  toPostgresImage: percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres
-  toPgBouncerImage: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbouncer1.24.0
-  toPgBackRestImage: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbackrest2.54.2
+  image: perconalab/percona-postgresql-operator:main
+  fromPostgresVersion: 16
+  toPostgresVersion: 17
+  toPostgresImage: perconalab/percona-postgresql-operator:main-ppg17-postgres
+  toPgBouncerImage: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
+  toPgBackRestImage: perconalab/percona-postgresql-operator:main-ppg17-pgbackrest
diff --git a/e2e-tests/tests/init-deploy/05-assert.yaml b/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.6.0
+    pgv2.percona.com/version: 2.7.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.6.0
+    pgv2.percona.com/version: 2.7.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.6.0
+    pgv2.percona.com/version: 2.7.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.6.0
+    pgv2.percona.com/version: 2.7.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.6.0
+    pgv2.percona.com/version: 2.7.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.6.0
+        pgv2.percona.com/version: 2.7.0
         postgres-operator.crunchydata.com/cluster: init-deploy
         postgres-operator.crunchydata.com/data: pgbackrest
         postgres-operator.crunchydata.com/pgbackrest: ""
diff --git a/e2e-tests/tests/upgrade-consistency/01-assert.yaml b/e2e-tests/tests/upgrade-consistency/01-assert.yaml
@@ -122,7 +122,7 @@ kind: PerconaPGCluster
 metadata:
   name: upgrade-consistency
 spec:
-  crVersion: 2.4.0
+  crVersion: 2.5.0
 status:
   pgbouncer:
     ready: 3
diff --git a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml
@@ -10,5 +10,5 @@ commands:
 
       get_cr \
         | yq eval '
-            .spec.crVersion="2.4.0"' - \
+            .spec.crVersion="2.5.0"' - \
         | kubectl -n "${NAMESPACE}" apply -f -
diff --git a/e2e-tests/tests/upgrade-consistency/02-assert.yaml b/e2e-tests/tests/upgrade-consistency/02-assert.yaml
@@ -120,7 +120,7 @@ kind: PerconaPGCluster
 metadata:
   name: upgrade-consistency
 spec:
-  crVersion: 2.5.0
+  crVersion: 2.6.0
 status:
   pgbouncer:
     ready: 3
diff --git a/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml
@@ -10,7 +10,7 @@ commands:
 
       get_cr \
         | yq eval '
-            .spec.crVersion="2.5.0"' - \
+            .spec.crVersion="2.6.0"' - \
         | kubectl -n "${NAMESPACE}" apply -f -
 
       sleep 10
diff --git a/e2e-tests/tests/upgrade-consistency/03-assert.yaml b/e2e-tests/tests/upgrade-consistency/03-assert.yaml
@@ -120,7 +120,7 @@ kind: PerconaPGCluster
 metadata:
   name: upgrade-consistency
 spec:
-  crVersion: 2.6.0
+  crVersion: 2.7.0
 status:
   pgbouncer:
     ready: 3
diff --git a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml
@@ -10,7 +10,7 @@ commands:
 
       get_cr \
         | yq eval '
-            .spec.crVersion="2.6.0"' - \
+            .spec.crVersion="2.7.0"' - \
         | kubectl -n "${NAMESPACE}" apply -f -
 
       sleep 10
diff --git a/e2e-tests/tests/upgrade-minor/05-assert.yaml b/e2e-tests/tests/upgrade-minor/05-assert.yaml
@@ -85,7 +85,7 @@ status:
 apiVersion: postgres-operator.crunchydata.com/v1beta1
 kind: PostgresCluster
 metadata:
-  generation: 2 # K8SPG-619
+  generation: 1
   labels:
     e2e: upgrade-minor
   name: upgrade-minor
@@ -103,7 +103,7 @@ status:
       readyReplicas: 3
       replicas: 3
       updatedReplicas: 3
-  observedGeneration: 2
+  observedGeneration: 1
   pgbackrest:
     repoHost:
       apiVersion: apps/v1
diff --git a/e2e-tests/tests/upgrade-minor/06-assert.yaml b/e2e-tests/tests/upgrade-minor/06-assert.yaml
@@ -112,7 +112,7 @@ status:
 apiVersion: postgres-operator.crunchydata.com/v1beta1
 kind: PostgresCluster
 metadata:
-  generation: 3 # K8SPG-619
+  generation: 2
   labels:
     e2e: upgrade-minor
   name: upgrade-minor
@@ -130,7 +130,7 @@ status:
       readyReplicas: 3
       replicas: 3
       updatedReplicas: 3
-  observedGeneration: 3
+  observedGeneration: 2
   pgbackrest:
     repoHost:
       apiVersion: apps/v1
diff --git a/internal/postgres/reconcile_test.go b/internal/postgres/reconcile_test.go
@@ -69,7 +69,7 @@ func TestInstancePod(t *testing.T) {
 	cluster.Spec.ImagePullPolicy = corev1.PullAlways
 	cluster.Spec.PostgresVersion = 11
 	cluster.SetLabels(map[string]string{
-		naming.LabelVersion: "2.6.0",
+		naming.LabelVersion: "2.7.0",
 	})
 
 	dataVolume := new(corev1.PersistentVolumeClaim)
diff --git a/percona/controller/testdata/sidecar-resources-cr.yaml b/percona/controller/testdata/sidecar-resources-cr.yaml
@@ -4,7 +4,7 @@ kind: PerconaPGCluster
 metadata:
   name: cluster1
 spec:
-  crVersion: 2.6.0
+  crVersion: 2.7.0
 
   image: perconalab/percona-postgresql-operator:main-ppg17-postgres
   imagePullPolicy: Always
diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
@@ -22,7 +22,7 @@ func init() {
 }
 
 const (
-	Version     = "2.6.0"
+	Version     = "2.7.0"
 	ProductName = "pg-operator"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func init() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`const (`
`25`		`- Version = "2.6.0"`
	`25`	`+ Version = "2.7.0"`
`26`	`26`	`ProductName = "pg-operator"`
`27`	`27`	`)`
`28`	`28`