K8SPSMDB-1265: Update main branch after 1.20.0 release (#1937)

jvpasinatto · web-flow · commit 502e4e8a52b8 · 2025-05-22T00:50:11.000+03:00
* K8SPSMDB-1265: Update main branch after 1.20.0 release

* Update upgrade-consistency-sharded-tls

* Update testdata images

* Use perconalab in testdata images

* Fix upgrade-consistency-sharded-tls test

* Remove version.go file
diff --git a/deploy/cr-minimal.yaml b/deploy/cr-minimal.yaml
@@ -3,8 +3,8 @@ kind: PerconaServerMongoDB
 metadata:
   name: minimal-cluster
 spec:
-  crVersion: 1.20.0
-  image: percona/percona-server-mongodb:7.0.18-11
+  crVersion: 1.21.0
+  image: perconalab/percona-server-mongodb-operator:main-mongod8.0
   unsafeFlags:
     replsetSize: true
     mongosSize: true
diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -13,8 +13,8 @@ spec:
 #  pause: true
 #  unmanaged: false
 #  enableVolumeExpansion: false
-  crVersion: 1.20.0
-  image: percona/percona-server-mongodb:7.0.18-11
+  crVersion: 1.21.0
+  image: perconalab/percona-server-mongodb-operator:main-mongod8.0
   imagePullPolicy: Always
 #  tls:
 #    mode: preferTLS
@@ -27,7 +27,7 @@ spec:
 #      group: cert-manager.io
 #  imagePullSecrets:
 #    - name: private-registry-credentials
-#  initImage: percona/percona-server-mongodb-operator:1.20.0
+#  initImage: perconalab/percona-server-mongodb-operator:main
 #  initContainerSecurityContext: {}
 #  unsafeFlags:
 #    tls: false
@@ -59,7 +59,7 @@ spec:
 #    sse: my-cluster-name-sse
   pmm:
     enabled: false
-    image: percona/pmm-client:2.44.1
+    image: perconalab/pmm-client:dev-latest
     serverHost: monitoring-service
 #    containerSecurityContext: {}
 #    customClusterName: mongo-cluster
@@ -622,7 +622,7 @@ spec:
 
   backup:
     enabled: true
-    image: percona/percona-backup-mongodb:2.9.1
+    image: perconalab/percona-server-mongodb-operator:main-backup
 #    annotations:
 #      iam.amazonaws.com/role: role-arn
 #    resources:
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1210.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1210.yml
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-rs0-1210.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-rs0-1210.yml
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1191-oc.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1191-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 5
+  generation: 3
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1191.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1191.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 5
+  generation: 3
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1200-oc.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1200-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 7
+  generation: 5
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1200.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1200.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 7
+  generation: 5
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210-oc.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 7
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 7
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1191-oc.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1191-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 5
+  generation: 3
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1191.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1191.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 5
+  generation: 3
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1200-oc.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1200-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 7
+  generation: 5
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1200.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1200.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 7
+  generation: 5
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210-oc.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 7
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 7
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/conf/some-name.yml b/e2e-tests/upgrade-consistency-sharded-tls/conf/some-name.yml
@@ -6,7 +6,7 @@ metadata:
     - percona.com/delete-psmdb-pods-in-order
     - percona.com/delete-psmdb-pvc
 spec:
-  crVersion: 1.18.0
+  crVersion: 1.19.1
   #platform: openshift
   image:
   imagePullPolicy: Always
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/run b/e2e-tests/upgrade-consistency-sharded-tls/run
@@ -24,7 +24,7 @@ main() {
 	kubectl_bin apply -f "$conf_dir/client_with_tls.yml"
 	deploy_cmctl
 
-	desc "create first PSMDB cluster 1.18.0 $CLUSTER"
+	desc "create first PSMDB cluster 1.19.1 $CLUSTER"
 	apply_cluster "$test_dir/conf/${CLUSTER}.yml"
 
 	desc 'check if Pod started'
@@ -51,14 +51,14 @@ main() {
 	compare_generation "3" "statefulset" "${CLUSTER}-cfg"
 
 	desc 'check if service and statefulset created with expected config'
-	compare_kubectl service/${CLUSTER}-rs0 "-1180"
-	compare_kubectl service/${CLUSTER}-cfg "-1180"
-	compare_kubectl statefulset/${CLUSTER}-rs0 "-1180"
-	compare_kubectl statefulset/${CLUSTER}-cfg "-1180"
+	compare_kubectl service/${CLUSTER}-rs0 "-1191"
+	compare_kubectl service/${CLUSTER}-cfg "-1191"
+	compare_kubectl statefulset/${CLUSTER}-rs0 "-1191"
+	compare_kubectl statefulset/${CLUSTER}-cfg "-1191"
 
-	desc 'test 1.19.1'
+	desc 'test 1.20.0'
 	kubectl_bin patch psmdb "${CLUSTER}" --type=merge --patch '{
-        "spec": {"crVersion":"1.19.1"}
+        "spec": {"crVersion":"1.20.0"}
     }'
 	# Wait for at least one reconciliation
 	sleep 20
@@ -80,14 +80,14 @@ main() {
 	compare_generation "5" "statefulset" "${CLUSTER}-cfg"
 
 	desc 'check if service and statefulset created with expected config'
-	compare_kubectl service/${CLUSTER}-rs0 "-1191"
-	compare_kubectl service/${CLUSTER}-cfg "-1191"
-	compare_kubectl statefulset/${CLUSTER}-rs0 "-1191"
-	compare_kubectl statefulset/${CLUSTER}-cfg "-1191"
+	compare_kubectl service/${CLUSTER}-rs0 "-1200"
+	compare_kubectl service/${CLUSTER}-cfg "-1200"
+	compare_kubectl statefulset/${CLUSTER}-rs0 "-1200"
+	compare_kubectl statefulset/${CLUSTER}-cfg "-1200"
 
-	desc 'test 1.20.0'
+	desc 'test 1.21.0'
 	kubectl_bin patch psmdb "${CLUSTER}" --type=merge --patch '{
-        "spec": {"crVersion":"1.20.0"}
+        "spec": {"crVersion":"1.21.0"}
     }'
 	# Wait for at least one reconciliation
 	sleep 20
@@ -109,10 +109,10 @@ main() {
 	compare_generation "7" "statefulset" "${CLUSTER}-cfg"
 
 	desc 'check if service and statefulset created with expected config'
-	compare_kubectl service/${CLUSTER}-rs0 "-1200"
-	compare_kubectl service/${CLUSTER}-cfg "-1200"
-	compare_kubectl statefulset/${CLUSTER}-rs0 "-1200"
-	compare_kubectl statefulset/${CLUSTER}-cfg "-1200"
+	compare_kubectl service/${CLUSTER}-rs0 "-1210"
+	compare_kubectl service/${CLUSTER}-cfg "-1210"
+	compare_kubectl statefulset/${CLUSTER}-rs0 "-1210"
+	compare_kubectl statefulset/${CLUSTER}-cfg "-1210"
 
 	destroy "$namespace"
 
diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-rs0-1210.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-rs0-1210.yml
diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210-oc.yml
diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210.yml
diff --git a/e2e-tests/upgrade-consistency/conf/some-name-rs0.yml b/e2e-tests/upgrade-consistency/conf/some-name-rs0.yml
@@ -3,7 +3,7 @@ kind: PerconaServerMongoDB
 metadata:
   name: some-name
 spec:
-  crVersion: 1.18.0
+  crVersion: 1.19.1
   #platform: openshift
   image:
   imagePullPolicy: Always
diff --git a/e2e-tests/upgrade-consistency/run b/e2e-tests/upgrade-consistency/run
@@ -14,41 +14,41 @@ main() {
 	desc 'create secrets and start client'
 	kubectl_bin apply -f "${conf_dir}/client.yml" -f "${conf_dir}/secrets.yml"
 
-	desc "create first PSMDB cluster 1.18.0 $CLUSTER"
+	desc "create first PSMDB cluster 1.19.1 $CLUSTER"
 	apply_cluster "$test_dir/conf/${CLUSTER}-rs0.yml"
 
 	desc 'check if Pod started'
 	wait_for_running "${CLUSTER}-rs0" "3" "true"
 
 	desc 'check if service and statefulset created with expected config'
-	compare_kubectl service/${CLUSTER}-rs0 "-1180"
-	compare_kubectl statefulset/${CLUSTER}-rs0 "-1180"
+	compare_kubectl service/${CLUSTER}-rs0 "-1191"
+	compare_kubectl statefulset/${CLUSTER}-rs0 "-1191"
 
-	desc 'test 1.19.1'
+	desc 'test 1.20.0'
 	kubectl_bin patch psmdb "${CLUSTER}" --type=merge --patch '{
-        "spec": {"crVersion":"1.19.1"}
+        "spec": {"crVersion":"1.20.0"}
     }'
 	# Wait for at least one reconciliation
 	sleep 10
 	desc 'check if Pod started'
 	wait_for_running "${CLUSTER}-rs0" "3" "true"
 
 	desc 'check if service and statefulset created with expected config'
-	compare_kubectl service/${CLUSTER}-rs0 "-1191"
-	compare_kubectl statefulset/${CLUSTER}-rs0 "-1191"
+	compare_kubectl service/${CLUSTER}-rs0 "-1200"
+	compare_kubectl statefulset/${CLUSTER}-rs0 "-1200"
 
-	desc 'test 1.20.0'
+	desc 'test 1.21.0'
 	kubectl_bin patch psmdb "${CLUSTER}" --type=merge --patch '{
-        "spec": {"crVersion":"1.20.0"}
+        "spec": {"crVersion":"1.21.0"}
     }'
 	# Wait for at least one reconciliation
 	sleep 10
 	desc 'check if Pod started'
 	wait_for_running "${CLUSTER}-rs0" "3" "true"
 
 	desc 'check if service and statefulset created with expected config'
-	compare_kubectl service/${CLUSTER}-rs0 "-1200"
-	compare_kubectl statefulset/${CLUSTER}-rs0 "-1200"
+	compare_kubectl service/${CLUSTER}-rs0 "-1210"
+	compare_kubectl statefulset/${CLUSTER}-rs0 "-1210"
 
 	destroy $namespace
 
diff --git a/pkg/controller/perconaservermongodb/suite_test.go b/pkg/controller/perconaservermongodb/suite_test.go
@@ -106,6 +106,6 @@ func readDefaultCR(name, namespace string) (*psmdbv1.PerconaServerMongoDB, error
 
 	cr.Name = name
 	cr.Namespace = namespace
-	cr.Spec.InitImage = "percona/percona-server-mongodb-operator:1.20.0"
+	cr.Spec.InitImage = "perconalab/percona-server-mongodb-operator:main"
 	return cr, nil
 }
diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml
@@ -83,7 +83,7 @@ spec:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users
             optional: false
-        image: percona/percona-server-mongodb:7.0.18-11
+        image: perconalab/percona-server-mongodb-operator:main-mongod8.0
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -185,7 +185,7 @@ spec:
           value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
         - name: PBM_AGENT_TLS_ENABLED
           value: "true"
-        image: percona/percona-backup-mongodb:2.9.1
+        image: perconalab/percona-server-mongodb-operator:main-backup
         imagePullPolicy: Always
         name: backup-agent
         resources: {}
@@ -204,7 +204,7 @@ spec:
       initContainers:
       - command:
         - /init-entrypoint.sh
-        image: percona/percona-server-mongodb-operator:1.20.0
+        image: perconalab/percona-server-mongodb-operator:main
         imagePullPolicy: Always
         name: mongo-init
         resources:
diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml
@@ -83,7 +83,7 @@ spec:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users
             optional: false
-        image: percona/percona-server-mongodb:7.0.18-11
+        image: perconalab/percona-server-mongodb-operator:main-mongod8.0
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -185,7 +185,7 @@ spec:
           value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
         - name: PBM_AGENT_TLS_ENABLED
           value: "true"
-        image: percona/percona-backup-mongodb:2.9.1
+        image: perconalab/percona-server-mongodb-operator:main-backup
         imagePullPolicy: Always
         name: backup-agent
         resources: {}
@@ -204,7 +204,7 @@ spec:
       initContainers:
       - command:
         - /init-entrypoint.sh
-        image: percona/percona-server-mongodb-operator:1.20.0
+        image: perconalab/percona-server-mongodb-operator:main
         imagePullPolicy: Always
         name: mongo-init
         resources:
diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml
@@ -83,7 +83,7 @@ spec:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users
             optional: false
-        image: percona/percona-server-mongodb:7.0.18-11
+        image: perconalab/percona-server-mongodb-operator:main-mongod8.0
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -185,7 +185,7 @@ spec:
           value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
         - name: PBM_AGENT_TLS_ENABLED
           value: "true"
-        image: percona/percona-backup-mongodb:2.9.1
+        image: perconalab/percona-server-mongodb-operator:main-backup
         imagePullPolicy: Always
         name: backup-agent
         resources: {}
@@ -204,7 +204,7 @@ spec:
       initContainers:
       - command:
         - /init-entrypoint.sh
-        image: percona/percona-server-mongodb-operator:1.20.0
+        image: perconalab/percona-server-mongodb-operator:main
         imagePullPolicy: Always
         name: mongo-init
         resources:
diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml
diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml
diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml
