K8SPXC-1792: Update versions back to main after 1.20.0 release#2518
Merged
Conversation
* K8SPXC-1792: Update images and versions for 1.20.0 release * Fix logcollector version in crs
Co-authored-by: Eleonora Zinchenko <eleonora.zinchenko@percona.com>
* K8SPXC-1792: Update versions back to main after 1.20.0 * Remove bogdanjeler-ev from codeowners * Add upgrade-consistency-after-release to after-release * Fix manifests workflow * Fix upgrade consistency test * Fix comment in Makefile
eleo007
requested review from
egegunes,
gkech,
hors,
jvpasinatto,
mayankshah1607,
nmarukovich,
oksana-grishchenko,
pooknull and
valmiranogueira
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the operator and test scaffolding back to “main/dev” expectations after the 1.20.0 release by bumping the operator version, refreshing pinned dependencies, and sliding E2E upgrade-consistency fixtures forward.
Changes:
- Bump operator version labels/CR version from
1.20.0to1.21.0across deploy artifacts and version files. - Update “after release” automation (Makefile + workflow) to restore perconalab/dev images and advance upgrade-consistency compare fixtures.
- Refresh E2E fixtures/scripts and Go deps (notably
golang.org/x/cryptoandgolang.org/x/net).
Reviewed changes
Copilot reviewed 44 out of 49 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/version/version.txt | Bumps recorded operator version to 1.21.0. |
| Makefile | Extends after-release to revert dev images + adds upgrade-consistency-after-release automation. |
| go.mod | Updates indirect golang.org/x/* dependencies. |
| go.sum | Adds checksums for updated golang.org/x/* versions. |
| e2e-tests/users/compare/select-2-proxysql3.sql | Updates expected ProxySQL3 table list (adds pgsql* tables). |
| e2e-tests/users-scheduler/compare/select-2-proxysql3.sql | Same expected table list update for scheduler variant. |
| e2e-tests/upgrade-consistency/run | Slides tested CR versions window forward (now includes 1.19.1/1.20.0/1.21.0). |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1210.yml | Updates expected StatefulSet snapshot for 1.21.0 run. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1210-oc.yml | OpenShift variant snapshot update for 1.21.0. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1200.yml | Adjusts generation metadata for shifted window. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1200-oc.yml | OpenShift variant generation adjustment. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1191.yml | Adjusts generation metadata for shifted window. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1191-oc.yml | OpenShift variant generation adjustment. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1180-oc.yml | Removes oldest-window OpenShift compare fixture. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1170.yml | Removes oldest-window compare fixture. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1210.yml | Updates expected ProxySQL StatefulSet snapshot for 1.21.0. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1210-oc.yml | OpenShift variant snapshot update for 1.21.0. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1200.yml | Adjusts generation metadata for shifted window. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1200-oc.yml | OpenShift variant generation adjustment. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1191.yml | Adds env expectations + generation adjustment for shifted window. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1191-oc.yml | OpenShift variant generation adjustment. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170.yml | Removes oldest-window compare fixture. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170-oc.yml | Removes oldest-window OpenShift compare fixture. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1161.yml | Removes oldest-window compare fixture. |
| e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1161-oc.yml | Removes oldest-window OpenShift compare fixture. |
| e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1210.yml | Adds Service compare fixture for 1.21.0 window. |
| e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1191.yml | Adds Service compare fixture for 1.19.1 window. |
| e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1190.yml | Removes Service fixture for dropped 1.19.0. |
| e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1180.yml | Removes Service fixture for dropped 1.18.0. |
| e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1210.yml | Adds ProxySQL Service compare fixture for 1.21.0 window. |
| e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1191.yml | Adds ProxySQL Service compare fixture for 1.19.1 window. |
| e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1190.yml | Removes ProxySQL Service fixture for dropped 1.19.0. |
| e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1161.yml | Removes ProxySQL Service fixture for dropped 1.16.1. |
| e2e-tests/release_versions | Restores perconalab/dev images and bumps tested k8s/OpenShift/minikube versions. |
| e2e-tests/pvc-resize/run | Adjusts PVC resize size unit selection for AKS/EKS and prints chosen unit. |
| e2e-tests/functions | Bumps cert-manager version and makes PMM wait vars local. |
| e2e-tests/demand-backup-cloud-pxb/run | Makes backup destination file selection depend on PXC image (5.7 vs non-5.7). |
| e2e-tests/default-cr/run | Makes API key retrieval tolerate failures (but needs further correction per review comment). |
| deploy/cw-bundle.yaml | Bumps app.kubernetes.io/version label to v1.21.0. |
| deploy/crd.yaml | Bumps app.kubernetes.io/version label to v1.21.0. |
| deploy/cr.yaml | Bumps crVersion to 1.21.0. |
| deploy/cr-minimal.yaml | Bumps crVersion to 1.21.0. |
| deploy/bundle.yaml | Bumps app.kubernetes.io/version label to v1.21.0. |
| config/crd/patches/versionlabel_in_pxcrestore.yaml | Bumps version label to v1.21.0. |
| config/crd/patches/versionlabel_in_pxcbackup.yaml | Bumps version label to v1.21.0. |
| config/crd/patches/versionlabel_in_pxc.yaml | Bumps version label to v1.21.0. |
| build/logcollector/entrypoint.sh | Ensures passwd UID handling happens earlier for logrotate. |
| .github/workflows/reviewdog.yml | Tweaks release/non-release manifest checks; adds deploy-vs-release_versions consistency job. |
| .github/CODEOWNERS | Updates code owners for e2e-tests and Jenkinsfile. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+146
to
+149
| - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 | ||
| - name: Verify each deploy/*.yaml image matches its e2e-tests/release_versions entry | ||
| shell: bash | ||
| run: | |
Comment on lines
+71
to
+74
| API_KEY=$(curl --insecure -X POST -H "Content-Type: application/json" -d '{"name":"operator", "role": "Admin"}' "https://admin:$ADMIN_PASSWORD@$MONITORING_ENDPOINT/graph/api/auth/keys" | jq .key || true) | ||
| retry=0 | ||
| until [[ -n $API_KEY ]]; do | ||
| API_KEY=$(curl --insecure -X POST -H "Content-Type: application/json" -d '{"name":"operator", "role": "Admin"}' "https://admin:$ADMIN_PASSWORD@$MONITORING_ENDPOINT/graph/api/auth/keys" | jq .key) | ||
| API_KEY=$(curl --insecure -X POST -H "Content-Type: application/json" -d '{"name":"operator", "role": "Admin"}' "https://admin:$ADMIN_PASSWORD@$MONITORING_ENDPOINT/graph/api/auth/keys" | jq .key || true) |
valmiranogueira
previously approved these changes
Jun 8, 2026
hors
requested changes
Jun 8, 2026
| @@ -0,0 +1,298 @@ | |||
| #!/usr/bin/env bash | |||
Collaborator
There was a problem hiding this comment.
@eleo007 the problem is that we do not have this test anymore
Comment on lines
+146
to
+149
| - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 | ||
| - name: Verify each deploy/*.yaml image matches its e2e-tests/release_versions entry | ||
| shell: bash | ||
| run: | |
Comment on lines
+199
to
+202
| # 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 |
Comment on lines
+71
to
75
| API_KEY=$(curl --insecure -X POST -H "Content-Type: application/json" -d '{"name":"operator", "role": "Admin"}' "https://admin:$ADMIN_PASSWORD@$MONITORING_ENDPOINT/graph/api/auth/keys" | jq .key || true) | ||
| retry=0 | ||
| until [[ -n $API_KEY ]]; do | ||
| API_KEY=$(curl --insecure -X POST -H "Content-Type: application/json" -d '{"name":"operator", "role": "Admin"}' "https://admin:$ADMIN_PASSWORD@$MONITORING_ENDPOINT/graph/api/auth/keys" | jq .key) | ||
| API_KEY=$(curl --insecure -X POST -H "Content-Type: application/json" -d '{"name":"operator", "role": "Admin"}' "https://admin:$ADMIN_PASSWORD@$MONITORING_ENDPOINT/graph/api/auth/keys" | jq .key || true) | ||
| sleep 5 |
Collaborator
commit: f858464 |
hors
approved these changes
Jun 9, 2026
gkech
approved these changes
Jun 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
CHANGE DESCRIPTION
Problem:
Short explanation of the problem.
Cause:
Short explanation of the root cause of the issue if applicable.
Solution:
Short explanation of the solution we are providing with this PR.
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
compare/*-oc.yml)?Config/Logging/Testability