Repository navigation
[release-v1.42] Port CNI IP pool, Istio resources and AS number fixes - #5377
Open
caseydavenport wants to merge 4 commits into
Open
caseydavenport wants to merge 4 commits into
caseydavenport wants to merge 4 commits into
Conversation
An IPv6 pool reserved for tunnels or load balancers no longer turns on IPv6 assignment in the CNI config of a single-stack IPv4 cluster. Only pools whose allowedUses includes Workload, or is unset, decide assign_ipv4 and assign_ipv6 and the host-local ranges. Ported from projectcalico/calico#13983.
The pod-level resources field on the Istio CR was accepted but never applied, because overrides only reach individual containers. It now lands on the discovery, install-cni and istio-proxy containers. Ported from projectcalico/calico#14334.
The BGPConfiguration, BGPPeer and BGPFilter AS number fields declared format int32, which rejects AS numbers above 2147483647 and accepts negative ones. They now declare int64 with a 0 to 4294967295 range, matching the regenerated CRDs on calico master. Only those schema lines change; the rest of the imported CRDs stay at v3.32.3. Ported from projectcalico/calico#13979.
This reverts commit 9c5c755.
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
This PR ports three bug fixes from projectcalico/calico to release-v1.42 (Calico v3.32, Calico Enterprise v3.23).
CNI address families from workload IP pools
Port of PR 13983 (CNI families from workload pools).
cannot find a qualified ippool, no pools match the required use (Workload).Istio resources override
Port of PR 14334 (Istio resources override fix).
resourcesfor istiod, Istio CNI and ztunnel but ignored them, since overrides only set resources per container.4-byte AS numbers in the BGP CRDs
CRD re-import from PR 13979 (full 4-byte AS range).
format: int32, so the API server rejected AS numbers above 2147483647 and accepted negative ones.format: int64with a 0 to 4294967295 range, in the v1 and v3 Calico CRDs, not the Enterprise copies.make update-calico-crds. A later import with the backport should leave them unchanged.The full
pkg/renderunit suite passes. Not tried on a real cluster.AI assistance: Claude Code ported the three changes and wrote the tests; I reviewed them.
By opening this PR you take responsibility for every line in it, and you agree to explain the change yourself during review rather than routing review comments back through an agent. See AI_POLICY.md.
Release Note
For PR author
make gen-filesmake gen-versionsFor PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.Agent context
Decisions
format: int64,minimum: 0,maximum: 4294967295. The changed-field count per file matches the master-generated CRDs, and nothing else in the imported CRDs changes.Constraints and gotchas
Verification
go build ./...andgo vetare clean.make ut UT_DIR=./pkg/renderpasses: top-level render suite 560 of 560, and every sub-suite, including istio and common/components.Expected "assign_ipv6": "true" to have {key: value} "assign_ipv6": "false". Before the Istio fix, 3 of 4 failed.Code map