feat: Support multiple ArgoCD instances with ApplicationTrackingAnnotations#1637
Merged
svghadi merged 12 commits intoargoproj-labs:masterfrom Feb 19, 2025
Merged
Conversation
aali309
force-pushed
the
ApplicationTrackingAnnotations
branch
from
343db05 to
bd8f847
Compare
Contributor
ishitasequeira
left a comment
ishitasequeira
left a comment
There was a problem hiding this comment.
Sharing the feedback here from our chat for others to be able to advise further as well,
- We do not want to change the name of the config map being created. ArgoCD looks for a specific configMap and if it does not find the configMap, it defaults everything to default values.
- There is a limitation in Operator where we can have only 1 ArgoCD instance per namespace. I can see that you are creating both the ArgoCD instances in the same namespace here. Once you have them created in different namespaces, you would not need to make changes of creating a different configMap here.
Signed-off-by: Atif Ali <atali@redhat.com> resolve diff in bundle Signed-off-by: Atif Ali <atali@redhat.com>
Signed-off-by: Atif Ali <atali@redhat.com>
Signed-off-by: Atif Ali <atali@redhat.com> new approach for e2e tests Signed-off-by: Atif Ali <atali@redhat.com> new added annotation tracking Signed-off-by: Atif Ali <atali@redhat.com> create apps Signed-off-by: Atif Ali <atali@redhat.com> linter fix Signed-off-by: Atif Ali <atali@redhat.com> marshals the annotations into JSON for the ConfigMap Signed-off-by: Atif Ali <atali@redhat.com> create apps Signed-off-by: Atif Ali <atali@redhat.com>
Signed-off-by: Atif Ali <atali@redhat.com>
…nt.go Signed-off-by: Atif Ali <atali@redhat.com>
Signed-off-by: Atif Ali <atali@redhat.com>
Signed-off-by: Atif Ali <atali@redhat.com>
aali309
force-pushed
the
ApplicationTrackingAnnotations
branch
from
e6cda85 to
68cd075
Compare
jannfis
reviewed
Feb 3, 2025
Collaborator
jannfis
left a comment
jannfis
left a comment
There was a problem hiding this comment.
I've got two questions/comments
Signed-off-by: Atif Ali <atali@redhat.com>
…otations Signed-off-by: Atif Ali <atali@redhat.com>
…tion Signed-off-by: Atif Ali <atali@redhat.com>
jannfis
approved these changes
Feb 5, 2025
Collaborator
jannfis
left a comment
jannfis
left a comment
There was a problem hiding this comment.
LGTM. @iam-veeramalla or @svghadi , you might want to take a look as well.
svghadi
reviewed
Feb 17, 2025
Collaborator
svghadi
left a comment
svghadi
left a comment
There was a problem hiding this comment.
I have few questions on kuttl tests. Rest all looks good. Thanks
svghadi
reviewed
Feb 17, 2025
Signed-off-by: Atif Ali <atali@redhat.com>
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
4 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.
What type of PR is this?
What does this PR do / why we need it:
add ApplicationTrackingAnnotations to prevent resource conflicts between ArgoCD instances
Have you updated the necessary documentation?
Which issue(s) this PR fixes:
see this PR on argocd repo
Fixes #?
How to test changes / Special notes to the reviewer: