Repository navigation
Write shared configuration through server-side apply - #5324
Merged
caseydavenport merged 4 commits intoSep 22, 2026
Merged
caseydavenport merged 4 commits into
caseydavenport merged 4 commits into
Conversation
The installation controller declares the FelixConfiguration and BGPConfiguration fields it owns, and the API server tracks ownership of each one.
Generated from the branch the operator pins, which moved since the last sync.
Calico ships three mutating admission policies and three bindings.
Calico ships three mutating admission policies and three bindings.
1 of 5 tasks
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
Backport of projectcalico/calico#13944 to v3.33, rebuilt by hand because the operator code moved repos between the two.
Moves the installation controller's FelixConfiguration and BGPConfiguration writes onto server-side apply, so which fields belong to the operator is recorded in managed fields instead of in an annotation the operator maintains itself.
crd.projectcalico.org/v1directly, where the API server tracks ownership exactly as it does for v3.Differences from the upstream change, all forced by this branch:
cmd/main.go, since this branch has nopkg/daemon.deps.txthere, so the new package needs no generated-file update.Behavior changes worth a look during review:
A second commit regenerates the imported CRDs and admission policies. That drift comes from the release-v3.33 branch this repo pins, not from this change - it reproduces on a clean release-v1.44 - but the file generation check fails without it.
make utpasses across all 47 controller suites.Related: CORE-13698
Release Note
AI assistance: Claude Code
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.