Fix versions

Author: valmiranogueira

Makefile

@@ -274,6 +274,7 @@ update-version:
 
 # Prepare release
 include e2e-tests/release_versions
+RELEASE_IMAGE_BINLOG_SERVER := $(strip $(IMAGE_BINLOG_SERVER))
 CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
 release: manifests
 	$(SED) -i "/CERT_MANAGER_VER/s/CERT_MANAGER_VER=\".*/CERT_MANAGER_VER=\"$(CERT_MANAGER_VER)\"/" e2e-tests/vars.sh
@@ -292,12 +293,15 @@ release: manifests
 		-e "/^    haproxy:/,/^      image:/{s#image: .*#image: $(IMAGE_HAPROXY)#}" \
 		-e "/^    router:/,/^      image:/{s#image: .*#image: $(IMAGE_ROUTER84)#}" \
 		-e "/^  orchestrator:/,/^    image:/{s#image: .*#image: $(IMAGE_ORCHESTRATOR)#}" \
-		-e "/^#      binlogServer:/,/^#        image:/{s|^#        image: .*|#        image: $(IMAGE_BINLOG_SERVER)|}" \
+		-e "/^#      binlogServer:/,/^#        image:/{s|^#        image: .*|#        image: $(RELEASE_IMAGE_BINLOG_SERVER)|}" \
 		-e "/^  backup:/,/^    image:/{s#^    image: .*#    image: $(IMAGE_BACKUP84)#}" \
 		-e "/^  toolkit:/,/^    image:/{s#image: .*#image: $(IMAGE_TOOLKIT)#}" \
 		-e "/initContainer:/,/image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
 		-e "/^  pmm:/,/^    image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" \
 		deploy/cr.yaml
+	$(SED) -i \
+		-e "/^#      binlogServer:/,/^#        image:/{s|^#        image: .*|#        image: $(RELEASE_IMAGE_BINLOG_SERVER)|}" \
+		deploy/backup/restore.yaml
 	$(SED) -i \
 		-e "/^  mysqlshellRunner:/,/^    image:/{s#image: .*#image: $(IMAGE_MYSQL84)#}" \
 		deploy/clusterset.yaml

e2e-tests/release_versions

@@ -10,7 +10,7 @@ IMAGE_ORCHESTRATOR=percona/percona-orchestrator:3.2.6-22
 IMAGE_TOOLKIT=percona/percona-toolkit:3.7.1-4
 IMAGE_PMM_CLIENT=percona/pmm-client:3.8.1
 IMAGE_PMM_SERVER=percona/pmm-server:3.8.1
-IMAGE_BINLOG_SERVER=percona/percona-server-mysql-operator:1.2.0-binlog-server-0.3.1 
+IMAGE_BINLOG_SERVER=percona/percona-server-mysql-operator:1.2.0-binlog-server-0.3.1
 
 GKE_MIN=1.33
 GKE_MAX=1.35

e2e-tests/vars.sh

@@ -12,7 +12,7 @@ export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;'
 
 export MYSQL_VERSION=${MYSQL_VERSION:-"8.4"}
 export PMM_SERVER_VERSION=${PMM_SERVER_VERSION:-"1.4.3"}
-export CERT_MANAGER_VER="1.20.2"
+export CERT_MANAGER_VER="1.20.3"
 export MINIO_VER="5.4.0"
 export CHAOS_MESH_VER="2.7.2"
 export VAULT_VER="0.16.1"
@@ -58,6 +58,6 @@ set_image IMAGE_ORCHESTRATOR "perconalab/percona-server-mysql-operator:main-orch
 set_image IMAGE_ROUTER "perconalab/percona-server-mysql-operator:main-router${MYSQL_VERSION}"
 set_image IMAGE_TOOLKIT "perconalab/percona-server-mysql-operator:main-toolkit"
 set_image IMAGE_HAPROXY "perconalab/percona-server-mysql-operator:main-haproxy"
-set_image IMAGE_BINLOG_SERVER "perconalab/percona-binlog-server:0.3.1"
+set_image IMAGE_BINLOG_SERVER "percona/percona-server-mysql-operator:1.2.0-binlog-server-0.3.1"
 set_image IMAGE_PMM_CLIENT "perconalab/pmm-client:3-dev-latest"
 set_image IMAGE_PMM_SERVER "perconalab/pmm-server:3-dev-latest"