Skip to content

test(render): resolve calico image dynamically in goldmane/whisker deployment tests [release-v1.43]#4933

Open
electricjesus wants to merge 2 commits into
tigera:release-v1.43from
electricjesus:seth/goldmane-whisker-calico-image-version-v1.43
Open

test(render): resolve calico image dynamically in goldmane/whisker deployment tests [release-v1.43]#4933
electricjesus wants to merge 2 commits into
tigera:release-v1.43from
electricjesus:seth/goldmane-whisker-calico-image-version-v1.43

Conversation

@electricjesus

Copy link
Copy Markdown
Member

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 component
versions, so on release-v1.43 (calico pinned to v3.32.0) the rendered
:v3.32.0 no longer matches the hardcoded :master, failing the
full-Deployment Equal assertions (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 on release-v1.43.

  • Type: bug fix (test-only)
  • Components affected: pkg/render/goldmane, pkg/render/whisker

Release Note

NONE

For PR author

  • Tests for change.
  • If changing pkg/apis/, run make gen-files
  • If changing versions, run make gen-versions

…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.
@electricjesus electricjesus requested a review from a team as a code owner June 16, 2026 11:56
@marvin-tigera marvin-tigera added this to the v1.43.0 milestone 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants