From 6077a3ff879e413f74543cbbe5883c2bc9f6af1d Mon Sep 17 00:00:00 2001 From: Julio Pasinatto Date: Wed, 8 Jan 2025 15:46:49 -0300 Subject: [PATCH] Update testdata files with release images --- Makefile | 5 +++++ .../testdata/reconcile-statefulset/cfg-arbiter.yaml | 6 +++--- .../testdata/reconcile-statefulset/cfg-mongod.yaml | 6 +++--- .../testdata/reconcile-statefulset/cfg-nv.yaml | 6 +++--- .../testdata/reconcile-statefulset/rs0-arbiter.yaml | 4 ++-- .../testdata/reconcile-statefulset/rs0-mongod.yaml | 6 +++--- .../testdata/reconcile-statefulset/rs0-nv.yaml | 6 +++--- 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 4e25280f39..6f1f97b4e0 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,11 @@ release: manifests -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 # 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) diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml index 60c68d24a3..4d56b18abb 100644 --- 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 index 60c68d24a3..4d56b18abb 100644 --- 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 index 60c68d24a3..4d56b18abb 100644 --- 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 index e51bb7f1aa..8e0634ffcc 100644 --- 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 index 910717fd8c..b50697e471 100644 --- 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 index fab7d6e615..98a3d58a51 100644 --- 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: