Merge pull request #2100 from percona/release-1.21.1

K8SPSMDB-1508 - Release 1.21.1

Author: hors

Makefile

@@ -127,7 +127,6 @@ release: manifests
 		-e "s|perconalab/fluentbit:main-logcollector|$(IMAGE_LOGCOLLECTOR)|g" \
 		pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
 	$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"${IMAGE_OPERATOR}\"|g" pkg/controller/perconaservermongodb/suite_test.go
-	
 
 # Prepare main branch after release
 MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)

e2e-tests/functions

@@ -5,7 +5,7 @@ GIT_BRANCH=${VERSION:-$(git rev-parse --abbrev-ref HEAD | sed -e 's^/^-^g; s^[.]
 API="psmdb.percona.com/v1"
 OPERATOR_VERSION="$(grep 'crVersion' $(realpath $(dirname ${BASH_SOURCE[0]})/../deploy/cr.yaml) | awk '{print $2}')"
 IMAGE=${IMAGE:-"perconalab/percona-server-mongodb-operator:${GIT_BRANCH}"}
-IMAGE_MONGOD=${IMAGE_MONGOD:-"perconalab/percona-server-mongodb-operator:main-mongod7.0"}
+IMAGE_MONGOD=${IMAGE_MONGOD:-"perconalab/percona-server-mongodb-operator:main-mongod8.0"}
 IMAGE_MONGOD_CHAIN=${IMAGE_MONGOD_CHAIN:-$'
 perconalab/percona-server-mongodb-operator:main-mongod6.0
 perconalab/percona-server-mongodb-operator:main-mongod7.0
@@ -15,9 +15,9 @@ SKIP_BACKUPS_TO_AWS_GCP_AZURE=${SKIP_BACKUPS_TO_AWS_GCP_AZURE:-1}
 PMM_SERVER_VER=${PMM_SERVER_VER:-"9.9.9"}
 IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"percona/pmm-client:2.44.1-1"}
 IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
-IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3.4.1"}
-IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3.4.1"}
-CERT_MANAGER_VER="1.18.2"
+IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3-dev-latest"}
+IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3-dev-latest"}
+CERT_MANAGER_VER="1.19.1"
 MINIO_VER="5.4.0"
 CHAOS_MESH_VER="2.7.1"
 UPDATE_COMPARE_FILES=${UPDATE_COMPARE_FILES:-0}

e2e-tests/release_versions

@@ -1,4 +1,4 @@
-IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.21.0
+IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.21.1
 IMAGE_MONGOD80=percona/percona-server-mongodb:8.0.12-4
 IMAGE_MONGOD70=percona/percona-server-mongodb:7.0.24-13
 IMAGE_MONGOD60=percona/percona-server-mongodb:6.0.25-20

e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1210.yml renamed to e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1211.yml

@@ -56,9 +56,9 @@ main() {
 	compare_kubectl statefulset/${CLUSTER}-rs0 "-1201"
 	compare_kubectl statefulset/${CLUSTER}-cfg "-1201"
 
-	desc 'test 1.21.0'
+	desc 'test 1.21.1'
 	kubectl_bin patch psmdb "${CLUSTER}" --type=merge --patch '{
-        "spec": {"crVersion":"1.21.0"}
+        "spec": {"crVersion":"1.21.1"}
     }'
 	# Wait for at least one reconciliation
 	sleep 20
@@ -80,10 +80,10 @@ main() {
 	compare_generation "6" "statefulset" "${CLUSTER}-cfg"
 
 	desc 'check if service and statefulset created with expected config'
-	compare_kubectl service/${CLUSTER}-rs0 "-1210"
-	compare_kubectl service/${CLUSTER}-cfg "-1210"
-	compare_kubectl statefulset/${CLUSTER}-rs0 "-1210"
-	compare_kubectl statefulset/${CLUSTER}-cfg "-1210"
+	compare_kubectl service/${CLUSTER}-rs0 "-1211"
+	compare_kubectl service/${CLUSTER}-cfg "-1211"
+	compare_kubectl statefulset/${CLUSTER}-rs0 "-1211"
+	compare_kubectl statefulset/${CLUSTER}-cfg "-1211"
 
 	desc 'test 1.22.0'
 	kubectl_bin patch psmdb "${CLUSTER}" --type=merge --patch '{