Skip to content

Commit 6b9de14

Browse files
authored
Support multiple ArgoCD instances with ApplicationTrackingAnnotations (#844)
Signed-off-by: Atif Ali <[email protected]>
1 parent 14fad82 commit 6b9de14

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

bundle/manifests/argoproj.io_argocds.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,10 @@ spec:
11661166
have included in your ArgoCD server.
11671167
type: string
11681168
type: object
1169+
installationID:
1170+
description: InstallationID uniquely identifies an Argo CD instance
1171+
in multi-instance clusters.
1172+
type: string
11691173
kustomizeBuildOptions:
11701174
description: KustomizeBuildOptions is used to specify build options/parameters
11711175
to use with `kustomize build`.
@@ -14371,6 +14375,10 @@ spec:
1437114375
have included in your ArgoCD server.
1437214376
type: string
1437314377
type: object
14378+
installationID:
14379+
description: InstallationID uniquely identifies an Argo CD instance
14380+
in multi-instance clusters.
14381+
type: string
1437414382
kustomizeBuildOptions:
1437514383
description: KustomizeBuildOptions is used to specify build options/parameters
1437614384
to use with `kustomize build`.

bundle/manifests/gitops-operator.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ metadata:
164164
capabilities: Deep Insights
165165
console.openshift.io/plugins: '["gitops-plugin"]'
166166
containerImage: quay.io/redhat-developer/gitops-operator
167-
createdAt: "2025-02-13T17:48:46Z"
167+
createdAt: "2025-02-19T18:47:24Z"
168168
description: Enables teams to adopt GitOps principles for managing cluster configurations
169169
and application delivery across hybrid multi-cluster Kubernetes environments.
170170
features.operators.openshift.io/disconnected: "true"

config/crd/bases/argoproj.io_argocds.yaml

+9-1
Original file line numberDiff line numberDiff line change
@@ -1155,6 +1155,10 @@ spec:
11551155
have included in your ArgoCD server.
11561156
type: string
11571157
type: object
1158+
installationID:
1159+
description: InstallationID uniquely identifies an Argo CD instance
1160+
in multi-instance clusters.
1161+
type: string
11581162
kustomizeBuildOptions:
11591163
description: KustomizeBuildOptions is used to specify build options/parameters
11601164
to use with `kustomize build`.
@@ -14360,6 +14364,10 @@ spec:
1436014364
have included in your ArgoCD server.
1436114365
type: string
1436214366
type: object
14367+
installationID:
14368+
description: InstallationID uniquely identifies an Argo CD instance
14369+
in multi-instance clusters.
14370+
type: string
1436314371
kustomizeBuildOptions:
1436414372
description: KustomizeBuildOptions is used to specify build options/parameters
1436514373
to use with `kustomize build`.
@@ -24875,4 +24883,4 @@ spec:
2487524883
served: true
2487624884
storage: true
2487724885
subresources:
24878-
status: {}
24886+
status: {}

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.22.5
66

77
require (
88
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127
9-
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250108102230-dd067457c82b
9+
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e
1010
github.com/coreos/prometheus-operator v0.40.0
1111
github.com/go-logr/logr v1.4.2
1212
github.com/google/go-cmp v0.6.0

go.sum

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

0 commit comments

Comments
 (0)