Add --override-manager flag for server-side apply drift detection#1365
Add --override-manager flag for server-side apply drift detection#1365stefanprodan merged 1 commit intofluxcd:mainfrom
Conversation
yozel
force-pushed
the
yozel/override-manager
branch
2 times, most recently
from
b7a57ce to
9707168
Compare
stefanprodan
left a comment
stefanprodan
left a comment
There was a problem hiding this comment.
👍 This is a great addition that brings helm-controller closer to how Flux does drift detection in general.
@yozel please singoff you commit and force push, see here how to do it https://github.com/fluxcd/helm-controller/pull/1365/checks?check_run_id=56589881613
stefanprodan
added
enhancement
yozel
force-pushed
the
yozel/override-manager
branch
from
9707168 to
60e09e3
Compare
|
@stefanprodan just signed-off the commit 👍 |
yozel
force-pushed
the
yozel/override-manager
branch
from
60e09e3 to
d9fbaf0
Compare
|
It passes all the tests and checks. @matheuscscp could you take look when you have time? If you have any comments or suggestions, I can work on them immediately. |
stefanprodan
left a comment
stefanprodan
left a comment
There was a problem hiding this comment.
LGTM
Please open a PR in website to add the flag to the helm-controller options
|
Please squash all commits and force push |
|
Changed the wording on the usage of the flag, and created a PR for the website as well: fluxcd/website#2413 |
This flag allows specifying field managers whose ownership should be transferred to the helm-controller before performing drift detection. When a disallowed field manager is detected on a managed resource, its field ownership is replaced with the helm-controller's field owner, enabling proper drift detection for fields that were previously modified by other controllers or tools (e.g., kubectl). This feature mirrors the --override-manager flag available in FluxCD's kustomize-controller, providing consistent behavior across Flux components for managing server-side apply field ownership conflicts. Signed-off-by: Yasin Özel <yozel@nebius.com>
yozel
force-pushed
the
yozel/override-manager
branch
from
2bea665 to
dd07d87
Compare
I missed this comment, I've squashed and force pushed now |
3 participants
This flag allows specifying field managers whose ownership should be transferred to the helm-controller before performing drift detection. When a disallowed field manager is detected on a managed resource, its field ownership is replaced with the helm-controller's field owner, enabling proper drift detection for fields that were previously modified by other controllers or tools (e.g., kubectl).
This feature mirrors the --override-manager flag available in FluxCD's kustomize-controller, providing consistent behavior across Flux components for managing server-side apply field ownership conflicts.
Since it doesn't change the default behavior, the implementation doesn't introduce any breaking changes.
Fix: #896