Merge pull request #1777 from percona/update-versions-1190

K8SPSMDB-1224: Update images and versions for 1.19.0 release
percona · Jan 9, 2025 · e58583f · e58583f
2 parents 7050b21 + bda7743
commit e58583f
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 46 deletions.
diff --git a/Makefile b/Makefile
@@ -106,13 +106,20 @@ release: manifests
 	$(SED) -i "/Version = \"/s/Version = \".*/Version = \"$(VERSION)\"/" version/version.go
 	$(SED) -i \
 		-e "s/crVersion: .*/crVersion: $(VERSION)/" \
-		-e "/^spec:/,/^  image:/{s#image: .*#image: $(IMAGE_MONGOD70)#}" deploy/cr-minimal.yaml
+		-e "/^spec:/,/^  image:/{s#image: .*#image: $(IMAGE_MONGOD80)#}" deploy/cr-minimal.yaml
 	$(SED) -i \
 		-e "s/crVersion: .*/crVersion: $(VERSION)/" \
-		-e "/^spec:/,/^  image:/{s#image: .*#image: $(IMAGE_MONGOD70)#}" \
+		-e "/^spec:/,/^  image:/{s#image: .*#image: $(IMAGE_MONGOD80)#}" \
 		-e "/^  backup:/,/^    image:/{s#image: .*#image: $(IMAGE_BACKUP)#}" \
 		-e "s#initImage: .*#initImage: percona/percona-server-mongodb-operator:$(VERSION)#g" \
 		-e "/^  pmm:/,/^    image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" deploy/cr.yaml
+	$(SED) -i \
+		-e "s|perconalab/percona-server-mongodb-operator:main-mongod7.0|$(IMAGE_MONGOD80)|g" \
+		-e "s|perconalab/percona-server-mongodb-operator:main-backup|$(IMAGE_BACKUP)|g" \
+		-e "s|perconalab/percona-server-mongodb-operator:main|$(IMAGE_OPERATOR)|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)
@@ -122,13 +129,19 @@ after-release: manifests
 	$(SED) -i "/Version = \"/s/Version = \".*/Version = \"$(NEXT_VER)\"/" version/version.go
 	$(SED) -i \
 		-e "s/crVersion: .*/crVersion: $(NEXT_VER)/" \
-		-e "/^spec:/,/^  image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod7.0#}" deploy/cr-minimal.yaml
+		-e "/^spec:/,/^  image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod8.0#}" deploy/cr-minimal.yaml
 	$(SED) -i \
 		-e "s/crVersion: .*/crVersion: $(NEXT_VER)/" \
-		-e "/^spec:/,/^  image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod7.0#}" \
+		-e "/^spec:/,/^  image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod8.0#}" \
 		-e "/^  backup:/,/^    image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-backup#}" \
 		-e "s#initImage: .*#initImage: perconalab/percona-server-mongodb-operator:main#g" \
 		-e "/^  pmm:/,/^    image:/{s#image: .*#image: perconalab/pmm-client:dev-latest#}" deploy/cr.yaml
+	$(SED) -i \
+		-e "s|$(IMAGE_MONGOD80)|perconalab/percona-server-mongodb-operator:main-mongod8.0|g" \
+		-e "s|$(IMAGE_BACKUP)|perconalab/percona-server-mongodb-operator:main-backup|g" \
+		-e "s|$(IMAGE_OPERATOR)|perconalab/percona-server-mongodb-operator:main|g" \
+		pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
+	$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"perconalab/percona-server-mongodb-operator:main\"|g" pkg/controller/perconaservermongodb/suite_test.go
 
 version-service-client: swagger
 	curl https://raw.githubusercontent.com/Percona-Lab/percona-version-service/$(VS_BRANCH)/api/version.swagger.yaml \

diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -19752,7 +19752,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.0
           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.18.0
-  image: perconalab/percona-server-mongodb-operator:main-mongod7.0
+  crVersion: 1.19.0
+  image: percona/percona-server-mongodb:8.0.4-1-multi
   unsafeFlags:
     replsetSize: true
     mongosSize: true

diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -14,7 +14,7 @@ spec:
 #  unmanaged: false
 #  enableVolumeExpansion: false
   crVersion: 1.19.0
-  image: perconalab/percona-server-mongodb-operator:main-mongod7.0
+  image: percona/percona-server-mongodb:8.0.4-1-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.0
 #  initContainerSecurityContext: {}
 #  unsafeFlags:
 #    tls: false
@@ -59,7 +59,7 @@ spec:
 #    sse: my-cluster-name-sse
   pmm:
     enabled: false
-    image: perconalab/pmm-client:dev-latest
+    image: percona/pmm-client:2.44.0
     serverHost: monitoring-service
 #    containerSecurityContext: {}
 #    mongodParams: --environment=ENVIRONMENT
@@ -618,7 +618,7 @@ spec:
 
   backup:
     enabled: true
-    image: perconalab/percona-server-mongodb-operator:main-backup
+    image: percona/percona-backup-mongodb:2.8.0-multi
 #    annotations:
 #      iam.amazonaws.com/role: role-arn
 #    resources:

diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -19773,7 +19773,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.0
           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.0
           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.0
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3

diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -5,9 +5,8 @@ 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-mongod5.0
 perconalab/percona-server-mongodb-operator:main-mongod6.0
 perconalab/percona-server-mongodb-operator:main-mongod7.0
 perconalab/percona-server-mongodb-operator:main-mongod8.0'}
@@ -16,7 +15,7 @@ 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:-"perconalab/pmm-client:dev-latest"}
 IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
-CERT_MANAGER_VER="1.16.1"
+CERT_MANAGER_VER="1.16.2"
 tmp_dir=$(mktemp -d)
 sed=$(which gsed || which sed)
 date=$(which gdate || which date)

diff --git a/e2e-tests/release_versions b/e2e-tests/release_versions
@@ -1,16 +1,16 @@
-IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.18.0
-IMAGE_MONGOD70=percona/percona-server-mongodb:7.0.14-8
-IMAGE_MONGOD60=percona/percona-server-mongodb:6.0.17-14
-IMAGE_MONGOD50=percona/percona-server-mongodb:5.0.29-25
-IMAGE_BACKUP=percona/percona-backup-mongodb:2.6.0
-IMAGE_PMM_CLIENT=percona/pmm-client:2.43.2
-IMAGE_PMM_SERVER=percona/pmm-server:2.43.2
+IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.19.0
+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
+IMAGE_BACKUP=percona/percona-backup-mongodb:2.8.0-multi
+IMAGE_PMM_CLIENT=percona/pmm-client:2.44.0
+IMAGE_PMM_SERVER=percona/pmm-server:2.44.0
 GKE_MIN=1.28
 GKE_MAX=1.30
-EKS_MIN=1.28
+EKS_MIN=1.29
 EKS_MAX=1.31
 AKS_MIN=1.28
 AKS_MAX=1.31
-OPENSHIFT_MIN=4.13.52
-OPENSHIFT_MAX=4.17.3
-MINIKUBE_REL=1.31.0
+OPENSHIFT_MIN=4.14.44
+OPENSHIFT_MAX=4.17.11
+MINIKUBE_REL=1.34.0
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.0"
 	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: perconalab/percona-server-mongodb-operator:main-mongod7.0
+        image: percona/percona-server-mongodb:8.0.4-1-multi
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -185,7 +185,7 @@ spec:
           value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
         - name: PBM_AGENT_TLS_ENABLED
           value: "true"
-        image: perconalab/percona-server-mongodb-operator:main-backup
+        image: percona/percona-backup-mongodb:2.8.0-multi
         imagePullPolicy: Always
         name: backup-agent
         resources: {}
@@ -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.0
         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: perconalab/percona-server-mongodb-operator:main-mongod7.0
+        image: percona/percona-server-mongodb:8.0.4-1-multi
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -185,7 +185,7 @@ spec:
           value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
         - name: PBM_AGENT_TLS_ENABLED
           value: "true"
-        image: perconalab/percona-server-mongodb-operator:main-backup
+        image: percona/percona-backup-mongodb:2.8.0-multi
         imagePullPolicy: Always
         name: backup-agent
         resources: {}
@@ -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.0
         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: perconalab/percona-server-mongodb-operator:main-mongod7.0
+        image: percona/percona-server-mongodb:8.0.4-1-multi
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -185,7 +185,7 @@ spec:
           value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
         - name: PBM_AGENT_TLS_ENABLED
           value: "true"
-        image: perconalab/percona-server-mongodb-operator:main-backup
+        image: percona/percona-backup-mongodb:2.8.0-multi
         imagePullPolicy: Always
         name: backup-agent
         resources: {}
@@ -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.0
         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
@@ -83,7 +83,7 @@ spec:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users
             optional: false
-        image: perconalab/percona-server-mongodb-operator:main-mongod7.0
+        image: percona/percona-server-mongodb:8.0.4-1-multi
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -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.0
         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
@@ -83,7 +83,7 @@ spec:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users
             optional: false
-        image: perconalab/percona-server-mongodb-operator:main-mongod7.0
+        image: percona/percona-server-mongodb:8.0.4-1-multi
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -185,7 +185,7 @@ spec:
           value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
         - name: PBM_AGENT_TLS_ENABLED
           value: "true"
-        image: perconalab/percona-server-mongodb-operator:main-backup
+        image: percona/percona-backup-mongodb:2.8.0-multi
         imagePullPolicy: Always
         name: backup-agent
         resources: {}
@@ -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.0
         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
@@ -83,7 +83,7 @@ spec:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users
             optional: false
-        image: perconalab/percona-server-mongodb-operator:main-mongod7.0
+        image: percona/percona-server-mongodb:8.0.4-1-multi
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -184,7 +184,7 @@ spec:
           value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
         - name: PBM_AGENT_TLS_ENABLED
           value: "true"
-        image: perconalab/percona-server-mongodb-operator:main-backup
+        image: percona/percona-backup-mongodb:2.8.0-multi
         imagePullPolicy: Always
         name: backup-agent
         resources: {}
@@ -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.0
         imagePullPolicy: Always
         name: mongo-init
         resources: