Repository navigation
[release-v1.44] Give FelixConfiguration patches their own field managers - #5367
Merged
caseydavenport merged 2 commits intoOct 28, 2026
Merged
caseydavenport merged 2 commits into
caseydavenport merged 2 commits into
Conversation
…eir own field managers These two controllers call PatchFelixConfiguration on release-v1.44 but not on master, so projectcalico/calico#14397 did not cover them. Each gets its own owner; sharing one would let their writes clobber each other again.
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 ports PR 14397 (operator FelixConfiguration field managers) to release-v1.44. Since v1.44.0, the operator's first server-side apply of FelixConfiguration overwrites or removes settings from its own patches, including those migrated from
FELIX_*env vars. Those patches had no field manager, so the API server recorded them as "operator", which the apply treats as a pre-SSA operator whose fields it takes over.operator.tigera.io/istioandoperator.tigera.io/gatewayapi, and the manifest migration patches theFELIX_*settings asoperator.tigera.io/migration.operator.tigera.io/applicationlayerandoperator.tigera.io/egressgateway. Sharing one manager would bring back the same clobbering between them.Introduced by: PR 5324 (shared config via server-side apply), commit 1017cf8
Related: Bug CORE-13856 (FELIX_ vars lost on migration)
Release Note
AI assistance: Claude Code (Claude Opus 5.5) ported the change and drafted this description; I reviewed every change.
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.
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
operator.tigera.io/, rather than one shared manager, so the writers don't clobber each other's fields.Constraints and gotchas
github.com/tigera/operator/...on this branch instead ofgithub.com/projectcalico/calico/operator/..., and the import grouping differs, so one import hunk was applied by hand.Verification
make utpasses for pkg/controller/utils, migration/convert, managedfields, gatewayapi, istio, applicationlayer, and egressgateway.go build ./...andgo veton those packages are clean.Code map