Skip to content

test(render): resolve calico image dynamically in goldmane/whisker deployment tests#4932

Merged
caseydavenport merged 1 commit into
tigera:masterfrom
electricjesus:seth/goldmane-whisker-calico-image-version
Jun 16, 2026
Merged

test(render): resolve calico image dynamically in goldmane/whisker deployment tests#4932
caseydavenport merged 1 commit into
tigera:masterfrom
electricjesus:seth/goldmane-whisker-calico-image-version

Conversation

@electricjesus

Copy link
Copy Markdown
Member

Description

The Goldmane and Whisker deployment render tests hardcoded the expected
combined calico image as quay.io/calico/calico:master (and the whisker
container image as quay.io/calico/whisker:master). The renderer resolves
these via components.GetReference(components.CombinedCalicoImage(...)) and
components.GetReference(components.ComponentCalicoWhisker), which track the
pinned component versions.

On master the pins are master, so the tests pass by coincidence. On release
branches (e.g. release-v1.43, which pins calico v3.32.0) the rendered image
is :v3.32.0 while the test expects :master, so the full-Deployment Equal
assertion fails.

This computes the expected images the same way the renderer does, making the
tests version-agnostic so they pass on every branch and survive pin bumps.

  • Type: bug fix (test-only)
  • Components affected: pkg/render/goldmane, pkg/render/whisker
  • Testing: go test ./pkg/render/goldmane/ ./pkg/render/whisker/ passes on both
    master and release-v1.43.

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.
@caseydavenport caseydavenport merged commit 6e9ebc8 into tigera:master Jun 16, 2026
8 checks passed
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