Improve ArgoCD support #2041
Merged
Improve ArgoCD support #2041
Conversation
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
Signed-off-by: Fran Sanjuán <[email protected]>
philipgough
approved these changes
Mar 15, 2023
There was a problem hiding this comment.
@francescsanjuanmrf change makes sense but you will need to run make --always-make generate to generate YAML and pass CI
auto-merge was automatically disabled
March 16, 2023 16:15
Head branch was pushed to by a user without write access
|
Just added the modified YAML. Thanks for your help! |
Signed-off-by: Fran Sanjuán <[email protected]>
francescsanjuanmrf
force-pushed
the
main
branch
from
6be5913 to
ed4784b
Compare
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
The
relabelingsblock of theserviceMonitorconfiguration for the k8s-control-plane component does not include theactionfield.The default value for action is
replace.Having this field undefined makes ArgoCD to be always unsynced.
The definitions in this repo code lack the
actionfield, but when the object is created in Kubernetes, the field is written in the Kubernetes object with the default value (replace). Then, ArgoCD compares with the code in the repo and tries to sync again (removing theactionfield). This causes an infinite loop of adding and removing theactionfield.Setting the
actionfield to the default value (replace) in the code solves this problem and does not change the behavior ofserviceMonitor.Type of change
CHANGE(fix or feature that would cause existing functionality to not work as expected)FEATURE(non-breaking change which adds functionality)BUGFIX(non-breaking change which fixes an issue)ENHANCEMENT(non-breaking change which improves existing functionality)NONE(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Changelog entry