Merge pull request #1839 from percona/release-1.19.1

hors · web-flow · commit 94047f4cb3b5 · 2025-02-20T16:52:25.000+02:00
K8SPSMDB-1283: Update main branch after 1.19.1 release
diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -19754,7 +19754,7 @@ spec:
       serviceAccountName: percona-server-mongodb-operator
       containers:
         - name: percona-server-mongodb-operator
-          image: perconalab/percona-server-mongodb-operator:main
+          image: percona/percona-server-mongodb-operator:1.19.1
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3
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: perconalab/percona-server-mongodb-operator:main-mongod8.0
+  crVersion: 1.19.1
+  image: percona/percona-server-mongodb:7.0.15-9-multi
   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: perconalab/percona-server-mongodb-operator:main-mongod8.0
+  crVersion: 1.19.1
+  image: percona/percona-server-mongodb:7.0.15-9-multi
   imagePullPolicy: Always
 #  tls:
 #    mode: preferTLS
@@ -27,7 +27,7 @@ spec:
 #      group: cert-manager.io
 #  imagePullSecrets:
 #    - name: private-registry-credentials
-#  initImage: perconalab/percona-server-mongodb-operator:main
+#  initImage: percona/percona-server-mongodb-operator:1.19.1
 #  initContainerSecurityContext: {}
 #  unsafeFlags:
 #    tls: false
diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -19775,7 +19775,7 @@ spec:
       serviceAccountName: percona-server-mongodb-operator
       containers:
         - name: percona-server-mongodb-operator
-          image: perconalab/percona-server-mongodb-operator:main
+          image: percona/percona-server-mongodb-operator:1.19.1
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3
diff --git a/deploy/cw-operator.yaml b/deploy/cw-operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: percona-server-mongodb-operator
       containers:
         - name: percona-server-mongodb-operator
-          image: perconalab/percona-server-mongodb-operator:main
+          image: percona/percona-server-mongodb-operator:1.19.1
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: percona-server-mongodb-operator
       containers:
         - name: percona-server-mongodb-operator
-          image: perconalab/percona-server-mongodb-operator:main
+          image: percona/percona-server-mongodb-operator:1.19.1
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3
diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -347,7 +347,7 @@ wait_restore() {
 	echo -n "waiting psmdb-restore/restore-${backup_name} to reach ${target_state} state"
 	local current_state=
 	until [[ ${current_state} == ${target_state} ]]; do
-		sleep 1
+		sleep 0.5
 		echo -n .
 		let retry+=1
 		current_state=$(kubectl_bin get psmdb-restore restore-$backup_name -o jsonpath='{.status.state}')
diff --git a/e2e-tests/release_versions b/e2e-tests/release_versions
@@ -1,4 +1,4 @@
-IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.19.0
+IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.19.1
 IMAGE_MONGOD80=percona/percona-server-mongodb:8.0.4-1-multi
 IMAGE_MONGOD70=percona/percona-server-mongodb:7.0.15-9-multi
 IMAGE_MONGOD60=percona/percona-server-mongodb:6.0.19-16-multi
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1191.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1191.yml
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-rs0-1191.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-rs0-1191.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
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
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
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
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/run b/e2e-tests/upgrade-consistency-sharded-tls/run
@@ -85,9 +85,9 @@ main() {
 	compare_kubectl statefulset/${CLUSTER}-rs0 "-1180"
 	compare_kubectl statefulset/${CLUSTER}-cfg "-1180"
 
-	desc 'test 1.19.0'
+	desc 'test 1.19.1'
 	kubectl_bin patch psmdb "${CLUSTER}" --type=merge --patch '{
-        "spec": {"crVersion":"1.19.0"}
+        "spec": {"crVersion":"1.19.1"}
     }'
 	# 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 "-1190"
-	compare_kubectl service/${CLUSTER}-cfg "-1190"
-	compare_kubectl statefulset/${CLUSTER}-rs0 "-1190"
-	compare_kubectl statefulset/${CLUSTER}-cfg "-1190"
+	compare_kubectl service/${CLUSTER}-rs0 "-1191"
+	compare_kubectl service/${CLUSTER}-cfg "-1191"
+	compare_kubectl statefulset/${CLUSTER}-rs0 "-1191"
+	compare_kubectl statefulset/${CLUSTER}-cfg "-1191"
 
 	destroy "$namespace"
 
diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-rs0-1191.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-rs0-1191.yml
diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1191-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1191-oc.yml
diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1191.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1191.yml
diff --git a/e2e-tests/upgrade-consistency/run b/e2e-tests/upgrade-consistency/run
@@ -24,18 +24,18 @@ main() {
 	compare_kubectl service/${CLUSTER}-rs0 "-1180"
 	compare_kubectl statefulset/${CLUSTER}-rs0 "-1180"
 
-	desc 'test 1.19.0'
+	desc 'test 1.19.1'
 	kubectl_bin patch psmdb "${CLUSTER}" --type=merge --patch '{
-        "spec": {"crVersion":"1.19.0"}
+        "spec": {"crVersion":"1.19.1"}
     }'
 	# 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 "-1190"
-	compare_kubectl statefulset/${CLUSTER}-rs0 "-1190"
+	compare_kubectl service/${CLUSTER}-rs0 "-1191"
+	compare_kubectl statefulset/${CLUSTER}-rs0 "-1191"
 
 	desc 'test 1.20.0'
 	kubectl_bin patch psmdb "${CLUSTER}" --type=merge --patch '{
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 = "perconalab/percona-server-mongodb-operator:main"
+	cr.Spec.InitImage = "percona/percona-server-mongodb-operator:1.19.1"
 	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
@@ -204,7 +204,7 @@ spec:
       initContainers:
       - command:
         - /init-entrypoint.sh
-        image: perconalab/percona-server-mongodb-operator:main
+        image: percona/percona-server-mongodb-operator:1.19.1
         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
@@ -204,7 +204,7 @@ spec:
       initContainers:
       - command:
         - /init-entrypoint.sh
-        image: perconalab/percona-server-mongodb-operator:main
+        image: percona/percona-server-mongodb-operator:1.19.1
         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
@@ -204,7 +204,7 @@ spec:
       initContainers:
       - command:
         - /init-entrypoint.sh
-        image: perconalab/percona-server-mongodb-operator:main
+        image: percona/percona-server-mongodb-operator:1.19.1
         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
@@ -154,7 +154,7 @@ spec:
       initContainers:
       - command:
         - /init-entrypoint.sh
-        image: perconalab/percona-server-mongodb-operator:main
+        image: percona/percona-server-mongodb-operator:1.19.1
         imagePullPolicy: Always
         name: mongo-init
         resources:
diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml
@@ -204,7 +204,7 @@ spec:
       initContainers:
       - command:
         - /init-entrypoint.sh
-        image: perconalab/percona-server-mongodb-operator:main
+        image: percona/percona-server-mongodb-operator:1.19.1
         imagePullPolicy: Always
         name: mongo-init
         resources:
diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml
@@ -203,7 +203,7 @@ spec:
       initContainers:
       - command:
         - /init-entrypoint.sh
-        image: perconalab/percona-server-mongodb-operator:main
+        image: percona/percona-server-mongodb-operator:1.19.1
         imagePullPolicy: Always
         name: mongo-init
         resources:
diff --git a/version/version.go b/version/version.go
@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "1.20.0"
+	Version = "1.19.1"
 )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.19.0`
	`1`	`+IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.19.1`
`2`	`2`	`IMAGE_MONGOD80=percona/percona-server-mongodb:8.0.4-1-multi`
`3`	`3`	`IMAGE_MONGOD70=percona/percona-server-mongodb:7.0.15-9-multi`
`4`	`4`	`IMAGE_MONGOD60=percona/percona-server-mongodb:6.0.19-16-multi`