Merge pull request #2518 from percona/release-1.20.0

K8SPXC-1792: Update versions back to main after 1.20.0 release

Author: eleo007

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 * @hors @egegunes @pooknull @nmarukovich @gkech @mayankshah1607 @oksana-grishchenko
-/e2e-tests/ @jvpasinatto @eleo007 @valmiranogueira @bogdanjeler-ev @egegunes @nmarukovich @gkech @mayankshah1607 @oksana-grishchenko
-Jenkinsfile @jvpasinatto @eleo007 @valmiranogueira @bogdanjeler-ev
+/e2e-tests/ @jvpasinatto @eleo007 @valmiranogueira @egegunes @nmarukovich @gkech @mayankshah1607 @oksana-grishchenko @DhruthiKV
+Jenkinsfile @jvpasinatto @eleo007 @valmiranogueira @DhruthiKV

.github/workflows/reviewdog.yml

@@ -87,12 +87,12 @@ jobs:
         with:
           go-version: '1.26'
       - name: check on release branch
-        if: ${{ contains(github.base_ref, 'release-') }}
+        if: ${{ contains(github.base_ref, 'release-') && ! startsWith(github.head_ref, 'after-release-') }}
         run: |
           make generate manifests VERSION="$(cat pkg/version/version.txt)" IMAGE_TAG_BASE="percona/percona-xtradb-cluster-operator"
           git diff --exit-code
       - name: check on non release branches
-        if: ${{ ! contains(github.base_ref, 'release-') }}
+        if: ${{ ! contains(github.base_ref, 'release-') || startsWith(github.head_ref, 'after-release-') }}
         run: |
           make generate manifests VERSION=main
           git diff --exit-code
@@ -136,3 +136,75 @@ jobs:
             exit 1
           fi
           echo "All images are available."
+
+  deploy-images-in-release-versions:
+    name: runner / deploy images in release_versions
+    runs-on: ubuntu-latest
+    # Only relevant for release branches, where deploy manifests pin released images.
+    if: ${{ contains(github.base_ref, 'release-') }}
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - name: Verify each deploy/*.yaml image matches its e2e-tests/release_versions entry
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          # Return the value of an IMAGE_* variable from release_versions.
+          rv() { grep -E "^$1=" e2e-tests/release_versions | head -n1 | cut -d= -f2-; }
+
+          # Map a PerconaXtraDBCluster .spec.<component> to its release_versions variable.
+          # PXC and backup use the 8.4 (default) versions.
+          declare -A COMPONENT_VAR=(
+            [pxc]=IMAGE_PXC84
+            [haproxy]=IMAGE_HAPROXY
+            [proxysql]=IMAGE_PROXY
+            [logcollector]=IMAGE_LOGCOLLECTOR
+            [backup]=IMAGE_BACKUP84
+            [pmm]=IMAGE_PMM3_CLIENT
+          )
+
+          failed=0
+
+          # Compare a single image to the expected release_versions variable.
+          check_value() {
+            local where=$1 actual=$2 var=$3 expected
+            expected=$(rv "$var")
+            if [ -z "$expected" ]; then
+              echo "::error::$var is not defined in e2e-tests/release_versions"; failed=1; return
+            fi
+            if [ "$actual" != "$expected" ]; then
+              echo "::error::$where image '$actual' does not match $var='$expected' from e2e-tests/release_versions"; failed=1; return
+            fi
+            echo "OK: $where = $actual (matches $var)"
+          }
+
+          # PerconaXtraDBCluster manifests: verify EVERY image-bearing component under .spec.
+          # Any component without a mapping fails the check, so newly added images can't slip through.
+          for file in deploy/cr.yaml deploy/cr-minimal.yaml; do
+            while IFS= read -r comp; do
+              [ -z "$comp" ] && continue
+              image=$(yq ".spec.${comp}.image" "$file")
+              var=${COMPONENT_VAR[$comp]:-}
+              if [ -z "$var" ]; then
+                echo "::error file=$file::No release_versions mapping for component '$comp' (update this check)"; failed=1
+              else
+                check_value "$file[$comp]" "$image" "$var"
+              fi
+            done < <(yq '.spec | to_entries | .[] | select(.value | has("image")) | .key' "$file")
+          done
+
+          # Operator Deployment manifests: the operator container image must match IMAGE_OPERATOR.
+          for file in deploy/operator.yaml deploy/bundle.yaml; do
+            image=$(yq '.spec.template.spec.containers[]? | select(.name == "percona-xtradb-cluster-operator") | .image' "$file" | head -n1)
+            if [ -z "$image" ]; then
+              echo "::error file=$file::Could not find the operator container image"; failed=1
+            else
+              check_value "$file[operator]" "$image" IMAGE_OPERATOR
+            fi
+          done
+
+          if [ "$failed" -ne 0 ]; then
+            echo "::error::deploy manifest images are out of sync with e2e-tests/release_versions"
+            exit 1
+          fi
+          echo "All deploy images match their release_versions entries."

Makefile

@@ -163,12 +163,12 @@ update-version:
 MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)
 MINOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f2)
 NEXT_VER ?= $(MAJOR_VER).$$(($(MINOR_VER) + 1)).0
-after-release: update-version manifests
+after-release: update-version manifests upgrade-consistency-after-release
 	$(SED) -i \
 		-e "s/crVersion: .*/crVersion: $(NEXT_VER)/" \
 		-e "/^  pxc:/,/^    image:/{s#image: .*#image: perconalab/percona-xtradb-cluster-operator:main-pxc8.4#}" \
 		-e "/^  haproxy:/,/^    image:/{s#image: .*#image: perconalab/percona-xtradb-cluster-operator:main-haproxy#}" \
-		-e "/^  logcollector:/,/^    image:/{s#image: .*#image: perconalab/percona-xtradb-cluster-operator:main-logcollector#}" deploy/cr-minimal.yaml
+		-e "/^  logcollector:/,/^    image:/{s#image: .*#image: perconalab/fluentbit:main-logcollector#}" deploy/cr-minimal.yaml
 	$(SED) -i \
 		-e "s/crVersion: .*/crVersion: $(NEXT_VER)/" \
 		-e "/^  pxc:/,/^    image:/{s#image: .*#image: perconalab/percona-xtradb-cluster-operator:main-pxc8.4#}" \
@@ -178,6 +178,60 @@ after-release: update-version manifests
 		-e "/^  backup:/,/^    image:/{s#image: .*#image: perconalab/percona-xtradb-cluster-operator:main-pxc8.4-backup#}" \
 		-e "/initContainer:/,/image:/{s#image: .*#image: perconalab/percona-xtradb-cluster-operator:main#}" \
 		-e "/^  pmm:/,/^    image:/{s#image: .*#image: perconalab/pmm-client:3-dev-latest#}" deploy/cr.yaml
+# Revert release_versions file to perconalab dev images
+	$(SED) -i \
+		-e "s#^IMAGE_OPERATOR=.*#IMAGE_OPERATOR=perconalab/percona-xtradb-cluster-operator:main#" \
+		-e "s#^IMAGE_PXC84=.*#IMAGE_PXC84=perconalab/percona-xtradb-cluster-operator:main-pxc8.4#" \
+		-e "s#^IMAGE_BACKUP84=.*#IMAGE_BACKUP84=perconalab/percona-xtradb-cluster-operator:main-pxc8.4-backup#" \
+		-e "s#^IMAGE_PXC80=.*#IMAGE_PXC80=perconalab/percona-xtradb-cluster-operator:main-pxc8.0#" \
+		-e "s#^IMAGE_BACKUP80=.*#IMAGE_BACKUP80=perconalab/percona-xtradb-cluster-operator:main-pxc8.0-backup#" \
+		-e "s#^IMAGE_PXC57=.*#IMAGE_PXC57=perconalab/percona-xtradb-cluster-operator:main-pxc5.7#" \
+		-e "s#^IMAGE_BACKUP57=.*#IMAGE_BACKUP57=perconalab/percona-xtradb-cluster-operator:main-pxc5.7-backup#" \
+		-e "s#^IMAGE_PROXY=.*#IMAGE_PROXY=perconalab/percona-xtradb-cluster-operator:main-proxysql#" \
+		-e "s#^IMAGE_PROXY3=.*#IMAGE_PROXY3=perconalab/percona-xtradb-cluster-operator:main-proxysql3#" \
+		-e "s#^IMAGE_HAPROXY=.*#IMAGE_HAPROXY=perconalab/percona-xtradb-cluster-operator:main-haproxy#" \
+		-e "s#^IMAGE_LOGCOLLECTOR=.*#IMAGE_LOGCOLLECTOR=perconalab/fluentbit:main-logcollector#" \
+		-e "s#^IMAGE_PMM_CLIENT=.*#IMAGE_PMM_CLIENT=perconalab/pmm-client:dev-latest#" \
+		-e "s#^IMAGE_PMM_SERVER=.*#IMAGE_PMM_SERVER=perconalab/pmm-server:dev-latest#" \
+		-e "s#^IMAGE_PMM3_CLIENT=.*#IMAGE_PMM3_CLIENT=perconalab/pmm-client:3-dev-latest#" \
+		-e "s#^IMAGE_PMM3_SERVER=.*#IMAGE_PMM3_SERVER=perconalab/pmm-server:3-dev-latest#" e2e-tests/release_versions
+
+# Update the upgrade-consistency test window to the next version.
+# Gets the 3 tested versions from the run file, drops the oldest, keeps the two newest, and appends the next development version X.(Y+1).0.
+# Copies and renames compare files, bumps generation version in statefulset compare files.
+UC_DIR := e2e-tests/upgrade-consistency
+.PHONY: upgrade-consistency-after-release
+upgrade-consistency-after-release: ## Slide upgrade-consistency test window to the next version
+	@set -e; \
+	dir=$(UC_DIR); cmp=$$dir/compare; run=$$dir/run; \
+	vers=$$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+' $$run | awk '!seen[$$0]++' | sort -t. -k1,1n -k2,2n -k3,3n); \
+	n=$$(printf '%s\n' "$$vers" | grep -c .); \
+	[ "$$n" -eq 3 ] || { echo "ERROR: expected 3 tested versions in $$run, found $$n: $$vers" >&2; exit 1; }; \
+	v1=$$(printf '%s\n' "$$vers" | sed -n 1p); \
+	v2=$$(printf '%s\n' "$$vers" | sed -n 2p); \
+	v3=$$(printf '%s\n' "$$vers" | sed -n 3p); \
+	major=$${v3%%.*}; minor=$$(echo "$$v3" | cut -d. -f2); \
+	vnew=$$major.$$((minor + 1)).0; \
+	suf() { echo "$$1" | tr -d .; }; \
+	esc() { echo "$$1" | sed 's/\./\\./g'; }; \
+	echo "upgrade-consistency: replace old with new versions: [$$v1 $$v2 $$v3] -> [$$v2 $$v3 $$vnew]"; \
+	$(SED) -i "s/$$(esc $$v3)/$$vnew/g; s/-$$(suf $$v3)/-$$(suf $$vnew)/g" $$run; \
+	$(SED) -i "s/$$(esc $$v2)/$$v3/g; s/-$$(suf $$v2)/-$$(suf $$v3)/g" $$run; \
+	$(SED) -i "s/$$(esc $$v1)/$$v2/g; s/-$$(suf $$v1)/-$$(suf $$v2)/g" $$run; \
+	s2=$$(suf $$v2); s3=$$(suf $$v3); snew=$$(suf $$vnew); \
+	for f in $$cmp/*$$s3*; do cp "$$f" "$$(echo "$$f" | sed "s/$$s3/$$snew/")"; done; \
+	for s in $$s2 $$s3; do \
+		for f in $$cmp/statefulset_*$$s*; do \
+			g=$$(awk '/^  generation:/{print $$2; exit}' "$$f"); \
+			[ -n "$$g" ] && $(SED) -i "s/^  generation: $$g$$/  generation: $$((g - 1))/" "$$f"; \
+		done; \
+	done; \
+	keep=" $$s2 $$s3 $$snew "; \
+	for f in $$cmp/*.yml; do \
+		v=$$(basename "$$f" | grep -oE '[0-9]+'); \
+		case "$$keep" in *" $$v "*) : ;; *) rm -f "$$f" ;; esac; \
+	done; \
+	echo "upgrade-consistency: done; review with: git status $$dir"
 
 VS_BRANCH = main
 version-service-client: swagger

config/crd/patches/versionlabel_in_pxc.yaml

@@ -4,6 +4,6 @@ metadata:
   name: perconaxtradbclusters.pxc.percona.com
   labels:
     app.kubernetes.io/name: percona-xtradb-cluster
-    app.kubernetes.io/version: v1.20.0
+    app.kubernetes.io/version: v1.21.0
     app.kubernetes.io/component: crd
     app.kubernetes.io/part-of: percona-xtradb-cluster-operator

config/crd/patches/versionlabel_in_pxcbackup.yaml

@@ -4,6 +4,6 @@ metadata:
   name: perconaxtradbclusterbackups.pxc.percona.com
   labels:
     app.kubernetes.io/name: percona-xtradb-cluster
-    app.kubernetes.io/version: v1.20.0
+    app.kubernetes.io/version: v1.21.0
     app.kubernetes.io/component: crd
     app.kubernetes.io/part-of: percona-xtradb-cluster-operator

config/crd/patches/versionlabel_in_pxcrestore.yaml

@@ -4,6 +4,6 @@ metadata:
   name: perconaxtradbclusterrestores.pxc.percona.com
   labels:
     app.kubernetes.io/name: percona-xtradb-cluster
-    app.kubernetes.io/version: v1.20.0
+    app.kubernetes.io/version: v1.21.0
     app.kubernetes.io/component: crd
     app.kubernetes.io/part-of: percona-xtradb-cluster-operator

deploy/bundle.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-xtradb-cluster
     app.kubernetes.io/part-of: percona-xtradb-cluster-operator
-    app.kubernetes.io/version: v1.20.0
+    app.kubernetes.io/version: v1.21.0
   name: perconaxtradbclusterbackups.pxc.percona.com
 spec:
   group: pxc.percona.com
@@ -407,7 +407,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-xtradb-cluster
     app.kubernetes.io/part-of: percona-xtradb-cluster-operator
-    app.kubernetes.io/version: v1.20.0
+    app.kubernetes.io/version: v1.21.0
   name: perconaxtradbclusterrestores.pxc.percona.com
 spec:
   group: pxc.percona.com
@@ -1096,7 +1096,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-xtradb-cluster
     app.kubernetes.io/part-of: percona-xtradb-cluster-operator
-    app.kubernetes.io/version: v1.20.0
+    app.kubernetes.io/version: v1.21.0
   name: perconaxtradbclusters.pxc.percona.com
 spec:
   group: pxc.percona.com

deploy/cr-minimal.yaml

@@ -3,7 +3,7 @@ kind: PerconaXtraDBCluster
 metadata:
   name: minimal-cluster
 spec:
-  crVersion: 1.20.0
+  crVersion: 1.21.0
   secretsName: minimal-cluster-secrets
   unsafeFlags:
     tls: true

deploy/cr.yaml

@@ -10,7 +10,7 @@ metadata:
 #  annotations:
 #    percona.com/issue-vault-token: "true"
 spec:
-  crVersion: 1.20.0
+  crVersion: 1.21.0
 #  storageScaling:
 #    enableVolumeScaling: false
 #    enableExternalAutoscaling: false

deploy/crd.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-xtradb-cluster
     app.kubernetes.io/part-of: percona-xtradb-cluster-operator
-    app.kubernetes.io/version: v1.20.0
+    app.kubernetes.io/version: v1.21.0
   name: perconaxtradbclusterbackups.pxc.percona.com
 spec:
   group: pxc.percona.com
@@ -407,7 +407,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-xtradb-cluster
     app.kubernetes.io/part-of: percona-xtradb-cluster-operator
-    app.kubernetes.io/version: v1.20.0
+    app.kubernetes.io/version: v1.21.0
   name: perconaxtradbclusterrestores.pxc.percona.com
 spec:
   group: pxc.percona.com
@@ -1096,7 +1096,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-xtradb-cluster
     app.kubernetes.io/part-of: percona-xtradb-cluster-operator
-    app.kubernetes.io/version: v1.20.0
+    app.kubernetes.io/version: v1.21.0
   name: perconaxtradbclusters.pxc.percona.com
 spec:
   group: pxc.percona.com