Skip to content

Commit fa17c46

Browse files
authored
feat(argo-cd): Add ability to add project scoped cluster(s) (argoproj#1913)
Signed-off-by: Marco Kilchhofer <[email protected]>
1 parent b34b555 commit fa17c46

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: v2.6.5
33
kubeVersion: ">=1.22.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 5.26.3
6+
version: 5.27.0
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -23,5 +23,5 @@ dependencies:
2323
condition: redis-ha.enabled
2424
annotations:
2525
artifacthub.io/changes: |
26-
- kind: fixed
27-
description: Use default metrics port for argocd-server
26+
- kind: added
27+
description: Ability to add project scoped cluster(s)

charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ stringData:
2626
clusterResources: {{ .clusterResources | quote }}
2727
{{- end }}
2828
{{- end }}
29+
{{- if .project }}
30+
project: {{ .project | quote }}
31+
{{- end }}
2932
config: |
3033
{{- required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toRawJson | nindent 4 }}
3134
{{- end }}

charts/argo-cd/values.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ configs:
379379
## Ref:
380380
## - https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#clusters
381381
## - https://argo-cd.readthedocs.io/en/stable/operator-manual/security/#external-cluster-credentials
382+
## - https://argo-cd.readthedocs.io/en/stable/user-guide/projects/#project-scoped-repositories-and-clusters
382383
clusterCredentials: []
383384
# - name: mycluster
384385
# server: https://mycluster.com
@@ -400,6 +401,16 @@ configs:
400401
# tlsClientConfig:
401402
# insecure: false
402403
# caData: "<base64 encoded certificate>"
404+
# - name: mycluster3-project-scoped
405+
# server: https://mycluster3.com
406+
# labels: {}
407+
# annotations: {}
408+
# project: my-project1
409+
# config:
410+
# bearerToken: "<authentication token>"
411+
# tlsClientConfig:
412+
# insecure: false
413+
# caData: "<base64 encoded certificate>"
403414

404415
# DEPRECATED - Moved to configs.ssh.annotations
405416
# knownHostsAnnotations: {}

0 commit comments

Comments
 (0)