test(installation): skip Calico-variant VAP tests on release-v1.43#4922
Open
electricjesus wants to merge 2 commits into
Open
test(installation): skip Calico-variant VAP tests on release-v1.43#4922electricjesus wants to merge 2 commits into
electricjesus wants to merge 2 commits into
Conversation
The updateValidatingAdmissionPolicies Calico-variant tests assert that the protect-builtin-tiers ValidatingAdmissionPolicy is created, but that VAP is a Calico v3.33 feature (projectcalico/calico#12824) and is not present in the calico v3.32.x bundled by release-v1.43. The admission policies are generated from the pinned calico's api/admission/ dir, so the v1.43 config regen correctly dropped the Calico copy while leaving these hand-written tests, which then fail on the missing VAP. Skip the four affected tests on this branch, mirroring projectcalico/calico#12962 which skips the same tier-protection tests on calico release-v3.32. The early-return cases and the Enterprise-variant test still run (Calient v3.24 ships the VAP), so VAP-management coverage is retained. The tests pass on master, which pins calico master (where the VAP exists).
caseydavenport
approved these changes
Jun 15, 2026
caseydavenport
left a comment
caseydavenport
left a comment
Member
There was a problem hiding this comment.
LGTM - can revert this after v3.32.1 is released.
The GetValidatingAdmissionPolicies Calico-variant tests assert the protect-builtin-tiers VAP (projectcalico/calico#12824), a Calico v3.33 feature absent from the calico v3.32.x bundled by release-v1.43. Skip them, mirroring projectcalico/calico#12962 and the core_controller skip in this PR. Revert once release-v1.43 bumps its calico pin to a v3.32.x that carries the backport (projectcalico/calico#12982).
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
3 participants
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
Test-only change for
release-v1.43.The
updateValidatingAdmissionPoliciesCalico-variant unit tests (added in #4878) assert that theprotect-builtin-tiersValidatingAdmissionPolicy is created. But that VAP is a Calico v3.33 feature (projectcalico/calico#12824) and is not present in the OSS Calico v3.32.0 thatrelease-v1.43pins. The admission policies are generated from the pinned calico'sapi/admission/dir, so the v1.43 config regen (build: update config for v1.43) correctly dropped the Calico copy — while the hand-written tests still assert it, so they fail on the missing VAP.This skips the four affected
Variant: operator.Calicotests on this branch only, mirroring projectcalico/calico#12962 (which skips the same tier-protection tests on calicorelease-v3.32). The early-return cases and the Enterprise-variant test still run — Calient v3.24 does ship the VAP (calico-privaterelease-calient-v3.24-1has it), so VAP-management coverage is retained.Why the asymmetry is expected: operator releases alternate which product gets a new minor — even minors bump OSS Calico, odd minors bump Enterprise.
release-v1.43(odd) advanced Enterprise to v3.24 but kept OSS Calico at v3.32, so the OSS-side VAP isn't present yet (it arrives when an even operator minor moves OSS Calico to v3.33). Master is unaffected (pins calico master, which has the VAP), so the tests stay live there.pkg/controller/installation(test only)go test ./pkg/controller/installation/focused onupdateValidatingAdmissionPolicies→ 3 passed, 0 failed, 4 skipped (the 4 Calico-variant tests skip with a rationale; early-return + Enterprise-variant tests still pass).Release Note
For PR author
make gen-files— N/A, nopkg/apis/changes.make gen-versions— N/A, no version changes.For PR reviewers
kind/bug,release-note-not-required.