Skip to content

K8SPG-995: Add a check between cr and release_versions images for release #1614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eleo007 wants to merge 5 commits into
base: main
Choose a base branch
from
+67 −0
Open

K8SPG-995: Add a check between cr and release_versions images for release #1614

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3dd5b00
Add a check between cr and release_versions images for release
eleo007 May 25, 2026
2e2841a
Use yq
eleo007 Jun 8, 2026
9cb6764
Merge branch 'main' into rel_ver_cr_check
eleo007 Jun 8, 2026
4635bd1
Potential fix for pull request finding
eleo007 Jun 8, 2026
c9b6d83
Merge branch 'main' into rel_ver_cr_check
hors Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions .github/workflows/reviewdog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,67 @@ jobs:
make generate VERSION=main
git diff --exit-code

deploy-cr-release-versions:
name: deploy/cr.yaml vs e2e-tests/release_versions
if: ${{ contains(github.base_ref, 'release-') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
Comment thread
eleo007 marked this conversation as resolved.
Outdated
- name: Verify deploy/cr.yaml images match release_versions
Comment on lines +112 to +114
run: |
set -euo pipefail
# shellcheck disable=SC1091
source e2e-tests/release_versions

registry="${REGISTRY_NAME:-docker.io}"
pg_ver=$(grep -E '^[[:space:]]*postgresVersion:' deploy/cr.yaml | head -1 | sed 's/.*postgresVersion:[[:space:]]*//')
if [ -z "$pg_ver" ]; then
echo "::error::postgresVersion not found in deploy/cr.yaml"
exit 1
fi

postgres_var="IMAGE_POSTGRESQL${pg_ver}"
pgbouncer_var="IMAGE_PGBOUNCER${pg_ver}"
backrest_var="IMAGE_BACKREST${pg_ver}"
for var in "$postgres_var" "$pgbouncer_var" "$backrest_var"; do
if [ -z "${!var:-}" ]; then
echo "::error::${var} is not defined in e2e-tests/release_versions"
exit 1
fi
done
Comment on lines +127 to +135

expected_postgres="${registry}/${!postgres_var}"
expected_pgbouncer="${registry}/${!pgbouncer_var}"
expected_backrest="${registry}/${!backrest_var}"
expected_pmm="${registry}/${IMAGE_PMM3_CLIENT}"
expected_cr_version="${IMAGE_OPERATOR##*:}"

Comment on lines +138 to +142
spec_image=$(grep -E '^ image: ' deploy/cr.yaml | head -1 | awk '{print $2}')
pgbouncer_image=$(sed -n '/^ pgBouncer:/,/^ image:/p' deploy/cr.yaml | grep -E '^ image: ' | head -1 | awk '{print $2}')
backrest_image=$(sed -n '/^ pgbackrest:/,/^ image:/p' deploy/cr.yaml | grep -E '^ image: ' | head -1 | awk '{print $2}')
pmm_image=$(sed -n '/^ pmm:/,/^ image:/p' deploy/cr.yaml | grep -E '^ image: ' | head -1 | awk '{print $2}')
cr_version=$(grep -E '^[[:space:]]*crVersion:' deploy/cr.yaml | head -1 | awk '{print $2}')

@egegunes egegunes May 26, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i wonder if using yq would be simpler?

@eleo007 eleo007 Jun 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


failed=0
check() {
local name="$1" actual="$2" expected="$3"
if [ "$actual" != "$expected" ]; then
echo "::error::${name}: deploy/cr.yaml has '${actual}', e2e-tests/release_versions expects '${expected}'"
failed=1
fi
}

check "spec.image (IMAGE_POSTGRESQL${pg_ver})" "$spec_image" "$expected_postgres"
check "proxy.pgBouncer.image (IMAGE_PGBOUNCER${pg_ver})" "$pgbouncer_image" "$expected_pgbouncer"
check "backups.pgbackrest.image (IMAGE_BACKREST${pg_ver})" "$backrest_image" "$expected_backrest"
check "pmm.image (IMAGE_PMM3_CLIENT)" "$pmm_image" "$expected_pmm"
check "spec.crVersion (IMAGE_OPERATOR tag)" "$cr_version" "$expected_cr_version"

if [ "$failed" -ne 0 ]; then
exit 1
fi
echo "deploy/cr.yaml images match e2e-tests/release_versions."

e2e-release-versions-images:
name: e2e-tests release_versions image availability
runs-on: ubuntu-latest
Expand Down
Loading