test(render): resolve calico image dynamically in goldmane/whisker deployment tests [release-v1.43]#4933
Open
electricjesus wants to merge 2 commits into
Conversation
…ployment tests The Goldmane and Whisker deployment render tests hardcoded the expected combined calico image as quay.io/calico/calico:master. The renderer resolves it via components.GetReference(CombinedCalicoImage(...)), which tracks the pinned ComponentCalico version. On master the pin is "master" so the tests passed by coincidence; on release branches (e.g. release-v1.43 pinning v3.32.0) the hardcoded ":master" no longer matches the rendered ":v3.32.0", failing the full-Deployment Equal. Compute the expected image the same way the renderer does, so the tests are version-agnostic and pass on every branch and across pin bumps.
caseydavenport
approved these changes
Jun 16, 2026
release-v1.43 pinned the calico components to v3.32.0, but the combined/mono calico image that the goldmane/whisker deployment render now resolves is only published from OSS master, not v3.32.0 — so the operator FV fails resolving that image. Pin the calico image components (and CalicoRelease) to the OSS master dev build v3.33.0-0.dev-825-gb3a9845bdf4d, which publishes the combined image, and regenerate pkg/components/calico.go via gen-versions. libcalico-go is intentionally left at v3.32.0: its version doubles as the git ref that gen-versions clones the calico CRDs from, and the dev build is not a tagged ref. The CRDs are unchanged by this commit.
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.
Description
Cherry-pick of #4932 to
release-v1.43.The Goldmane and Whisker deployment render tests hardcoded the expected calico
images as
:master. The renderer resolves them from the pinned componentversions, so on
release-v1.43(calico pinned tov3.32.0) the rendered:v3.32.0no longer matches the hardcoded:master, failing thefull-Deployment
Equalassertions (Goldmane and Whisker both affected).This resolves the expected images the same way the renderer does, making the
tests version-agnostic. Verified
go test ./pkg/render/goldmane/ ./pkg/render/whisker/passes onrelease-v1.43.pkg/render/goldmane,pkg/render/whiskerRelease Note
For PR author
make gen-filesmake gen-versions