Support multiple ArgoCD instances with ApplicationTrackingAnnotations (…

…#844) Signed-off-by: Atif Ali <[email protected]>
redhat-developer · Feb 21, 2025 · 6b9de14 · 6b9de14
1 parent 14fad82
commit 6b9de14
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/bundle/manifests/argoproj.io_argocds.yaml b/bundle/manifests/argoproj.io_argocds.yaml
@@ -1166,6 +1166,10 @@ spec:
                       have included in your ArgoCD server.
                     type: string
                 type: object
+              installationID:
+                description: InstallationID uniquely identifies an Argo CD instance
+                  in multi-instance clusters.
+                type: string
               kustomizeBuildOptions:
                 description: KustomizeBuildOptions is used to specify build options/parameters
                   to use with `kustomize build`.
@@ -14371,6 +14375,10 @@ spec:
                       have included in your ArgoCD server.
                     type: string
                 type: object
+              installationID:
+                description: InstallationID uniquely identifies an Argo CD instance
+                  in multi-instance clusters.
+                type: string
               kustomizeBuildOptions:
                 description: KustomizeBuildOptions is used to specify build options/parameters
                   to use with `kustomize build`.

diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml
@@ -164,7 +164,7 @@ metadata:
     capabilities: Deep Insights
     console.openshift.io/plugins: '["gitops-plugin"]'
     containerImage: quay.io/redhat-developer/gitops-operator
-    createdAt: "2025-02-13T17:48:46Z"
+    createdAt: "2025-02-19T18:47:24Z"
     description: Enables teams to adopt GitOps principles for managing cluster configurations
       and application delivery across hybrid multi-cluster Kubernetes environments.
     features.operators.openshift.io/disconnected: "true"

diff --git a/config/crd/bases/argoproj.io_argocds.yaml b/config/crd/bases/argoproj.io_argocds.yaml
@@ -1155,6 +1155,10 @@ spec:
                       have included in your ArgoCD server.
                     type: string
                 type: object
+              installationID:
+                description: InstallationID uniquely identifies an Argo CD instance
+                  in multi-instance clusters.
+                type: string
               kustomizeBuildOptions:
                 description: KustomizeBuildOptions is used to specify build options/parameters
                   to use with `kustomize build`.
@@ -14360,6 +14364,10 @@ spec:
                       have included in your ArgoCD server.
                     type: string
                 type: object
+              installationID:
+                description: InstallationID uniquely identifies an Argo CD instance
+                  in multi-instance clusters.
+                type: string
               kustomizeBuildOptions:
                 description: KustomizeBuildOptions is used to specify build options/parameters
                   to use with `kustomize build`.
@@ -24875,4 +24883,4 @@ spec:
     served: true
     storage: true
     subresources:
-      status: {}
+      status: {}
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.22.5
 
 require (
 	github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127
-	github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250108102230-dd067457c82b
+	github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e
 	github.com/coreos/prometheus-operator v0.40.0
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.6.0

diff --git a/go.sum b/go.sum
@@ -622,8 +622,8 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
 github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
 github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127 h1:chOb5NQfFybnoDHwdkjhC2Y9YgsSjNxgXIKLEGBgWho=
 github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127/go.mod h1:hX18xfJcnomx/k6urvDp/7+Zwa/y5aF1Mlhz5a2en4k=
-github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250108102230-dd067457c82b h1:AxAfqU70G612yuTD/R/PLtj2kgjwmDIues2LE7KFJi0=
-github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250108102230-dd067457c82b/go.mod h1:MUtczQYV6MPOjGb2gCju80r1qB4jsRgy8bllChve35U=
+github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e h1:55snlduYkXFPAeYpXjJS52kvXLnEsfSOB+XaUe0Ga+Y=
+github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e/go.mod h1:FoPi0HK2noC0QQn/T5UTtD3/845yHhpdd0I6rrsW+2U=
 github.com/argoproj/argo-cd/v2 v2.12.3 h1:Bi4QahHTnKl3esU5MplQP1wraGhaTpvgAV4GsMqc3Zc=
 github.com/argoproj/argo-cd/v2 v2.12.3/go.mod h1:2fh6q4NX/cylbH6Ktx/KjJsX7sOBwF3jbGnO0IZyNOc=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=