ArmstrongLabs
/
argo-helm
forked from argoproj/argo-helm
1
0
Fork 0
Code Pull Requests Packages Activity

feat(argo-cd): Add label to cluster-secrets for usage with appSet cluster selector (#692) 

* add cluster label for use with appSet cluster selector

Signed-off-by: mike sarver <mike.sarver@ibotta.com>

* feat(argo-cd): Add label to cluster-secrets for usage with appSet cluster selector

Signed-off-by: mike sarver <mike.sarver@ibotta.com>

* feat(argo-cd): use with for adding labels

Signed-off-by: mike sarver <mike.sarver@ibotta.com>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>
main argo-cd-3.2.1
Mike Sarver 2021-04-23 17:14:52 -06:00 committed by GitHub
parent 7b78693819
commit 71cbdbb811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/argo-cd/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 2.0.0 appVersion: 2.0.0
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 3.2.0 version: 3.2.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

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

@ -6,6 +6,9 @@ metadata:
name: {{ include "argo-cd.name" $ }}-cluster-{{ .name }} name: {{ include "argo-cd.name" $ }}-cluster-{{ .name }}
labels: labels:
{{- include "argo-cd.labels" (dict "context" $) | nindent 4 }} {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
{{- with .labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
argocd.argoproj.io/secret-type: cluster argocd.argoproj.io/secret-type: cluster
{{- with .annotations }} {{- with .annotations }}
annotations: annotations:

2
charts/argo-cd/values.yaml
View File

@ -881,6 +881,7 @@ configs:
clusterCredentials: [] clusterCredentials: []
# - name: mycluster # - name: mycluster
# server: https://mycluster.com # server: https://mycluster.com
# labels: {}
# annotations: {} # annotations: {}
# config: # config:
# bearerToken: "<authentication token>" # bearerToken: "<authentication token>"
@ -889,6 +890,7 @@ configs:
# caData: "<base64 encoded certificate>" # caData: "<base64 encoded certificate>"
# - name: mycluster2 # - name: mycluster2
# server: https://mycluster2.com # server: https://mycluster2.com
# labels: {}
# annotations: {} # annotations: {}
# namespaces: namespace1,namespace2 # namespaces: namespace1,namespace2
# config: # config: