[v1.43-2] Pin the Calico version to v3.32.0 - #5162
Open
fasaxc wants to merge 3 commits into
Open
Conversation
`make gen-versions` fetches the Calico CRDs live from the branch named in config/calico_versions.yml, so the committed copies go stale on their own whenever that source moves. It has moved: controller-gen no longer wraps these two enums in a redundant `allOf`, so every build on this branch failed `validate-gen-versions` -> `dirty-check` before running anything else. Generated output only; no hand edits. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This branch was cut from release-v1.43 but kept `master` in
`config/calico_versions.yml` for all 25 components and the title, where
release-v1.43 pins v3.32.0. Every other release branch pins a concrete OSS
version.
Tracking a moving `master` broke the branch on its own schedule, in three
places:
* `make gen-versions` fetches the Calico CRDs live from the pinned ref, so
the committed copies went stale by themselves once controller-gen stopped
wrapping two FelixConfiguration enums in a redundant `allOf`.
`validate-gen-versions` then failed the dirty-check, killing every build on
the branch before it ran anything. The previous commit papered over this by
re-syncing from master; pinning fixes the cause.
* The branch cut also imported master's `protect-builtin-tiers.yaml`
admission policy while keeping this stream's UT expectation that the Calico
variant creates no ValidatingAdmissionPolicies, so `Run UTs` failed too.
* The FVs deployed `docker.io/calico/node:master`, and every other component
at `:master`, rather than the version this branch ships.
Pinning v3.32.0 and regenerating fixes the first two. The CRDs shrink because
the committed copies were master-derived; they now match what the branch
actually ships.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
fasaxc
changed the title
fasaxc
changed the title
fasaxc
added
release-note-not-required
docs-not-required
and removed
docs-pr-required
release-note-required
labels
`VERSION_TAG` is what the FV targets pull, so it was fetching `docker.io/calico/node:master` and the ten other components at `:master` independently of `config/calico_versions.yml`. release-v1.43 has v3.32.0 here; this was the only other difference between the two branches' Makefiles. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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
2 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.
release-v1.43-2was cut fromrelease-v1.43but somehow ended up with OS pins atmaster, which is breaking CI (because v1.43 operator doesn't support master OS code). Pin to the same asrelease-v1.43— bothconfig/calico_versions.ymland the Makefile'sVERSION_TAG, which is what the FVs pull.Unblocks #5158.
Release note: