Support additional Field Managers in the disallow list#1017
Merged
stefanprodan merged 1 commit intofluxcd:mainfrom Nov 30, 2023
Merged
Conversation
Member
stefanprodan
left a comment
stefanprodan
left a comment
There was a problem hiding this comment.
@nalum please add tests for this, similar to kustomization_force_test.go
Member
Author
|
@stefanprodan would this change be picked up automatically in the docs or should I update them? Assuming I should update them they are located in the flux2 or website repo? |
Member
|
@nalum please squash into one or two commits and force push. I will make the docs changes in website before the release, there are other changes besides this to the controller global configuration. |
stefanprodan
added
enhancement
…nd build up the disallow list to include these Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie> Setup new flag to allow overriding additional managers and pass this data to the KustomizationReconciler instance Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie> Update field name to be more specific Co-authored-by: Stefan Prodan <stefan.prodan@gmail.com> Signed-off-by: Luke Mallon <luke@mallon.ie> Update the remaining fieldManagers vars to match the new definition Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie> Change AdditionalFieldManagers to DisallowedFieldManagers Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie> Add unit test to cover the new disallowed field manager change Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie> Use correct variable in the final Run Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie> Undo the timeout multiplication Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie> Update internal/controller/kustomization_disallowed_managers_test.go Co-authored-by: Stefan Prodan <stefan.prodan@gmail.com> Signed-off-by: Luke Mallon <luke@mallon.ie> Check for we're not getting errors on the Patch calls and remove the eventually as not needed here Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie> Update main.go Co-authored-by: Stefan Prodan <stefan.prodan@gmail.com> Signed-off-by: Luke Mallon <luke@mallon.ie>
nalum
force-pushed
the
issue-982-support-additional-field-managers-in-banlist
branch
from
4db46b2 to
96a7722
Compare
Member
Author
|
Think this is good for testing now @stefanprodan 👍 |
14 tasks
stefanprodan
approved these changes
Nov 29, 2023
Member
stefanprodan
left a comment
stefanprodan
left a comment
There was a problem hiding this comment.
LGTM
Thanks @nalum for this great contribution 🏅
nalum
deleted the
issue-982-support-additional-field-managers-in-banlist
branch
6 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
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.
Setup a new flag to pass in the names of managers that should be overwritten in the same way that
kubectlchanges are.Closes #982