From 71cbdbb811655b2a8ed1b7f8f36347061052ce1c Mon Sep 17 00:00:00 2001 From: Mike Sarver Date: Fri, 23 Apr 2021 17:14:52 -0600 Subject: [PATCH] feat(argo-cd): Add label to cluster-secrets for usage with appSet cluster selector (#692) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add cluster label for use with appSet cluster selector Signed-off-by: mike sarver * feat(argo-cd): Add label to cluster-secrets for usage with appSet cluster selector Signed-off-by: mike sarver * feat(argo-cd): use with for adding labels Signed-off-by: mike sarver Co-authored-by: Oliver Bähler --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml | 3 +++ charts/argo-cd/values.yaml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index ed2d87be..72994ece 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.0 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.2.0 +version: 3.2.1 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml index a4190768..4fb7e883 100644 --- a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml +++ b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml @@ -6,6 +6,9 @@ metadata: name: {{ include "argo-cd.name" $ }}-cluster-{{ .name }} labels: {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }} + {{- with .labels }} + {{- toYaml . | nindent 4 }} + {{- end }} argocd.argoproj.io/secret-type: cluster {{- with .annotations }} annotations: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 32e244ab..adc358f7 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -881,6 +881,7 @@ configs: clusterCredentials: [] # - name: mycluster # server: https://mycluster.com + # labels: {} # annotations: {} # config: # bearerToken: "" @@ -889,6 +890,7 @@ configs: # caData: "" # - name: mycluster2 # server: https://mycluster2.com + # labels: {} # annotations: {} # namespaces: namespace1,namespace2 # config: