From 0ed86fc181eebc769d9a2baf8a60bd759d14f7eb Mon Sep 17 00:00:00 2001 From: tomh Date: Tue, 5 Nov 2019 21:44:17 +0000 Subject: [PATCH] Resolves issues relating to setting the .Values.nameOverride to a value other than argocd. Relates to github issue: https://github.com/argoproj/argo-helm/issues/147 The argocd application expects that the label 'app.kubernetes.io/part-of' is set to 'argocd' otherwise the configmap or secret is rejected, and the argocd-dex-server, argocd-server, and argocd-application-controller fail to start. --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 +- charts/argo-cd/templates/argocd-configs/argocd-cm.yaml | 2 +- charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml | 2 +- charts/argo-cd/templates/argocd-configs/argocd-secret.yaml | 2 +- .../templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml | 2 +- .../argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 55b3868b..790adfcf 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.2.4" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.0.1 +version: 1.0.2 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 4c21d029..b63ae9e0 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -2,7 +2,7 @@ Argo CD Chart ====== A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. -Current chart version is `1.0.0` +Current chart version is `1.0.2` Source code can be found [here](https://argoproj.github.io/argo-cd/) diff --git a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml index ee1f90af..8f83fd6b 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml @@ -7,7 +7,7 @@ metadata: helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} + app.kubernetes.io/part-of: argocd app.kubernetes.io/component: {{ .Values.server.name }} data: {{- toYaml .Values.server.config | nindent 4 }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml index 44b1db4b..34d1db45 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml @@ -7,7 +7,7 @@ metadata: helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} + app.kubernetes.io/part-of: argocd app.kubernetes.io/component: {{ .Values.server.name }} data: {{- toYaml .Values.server.rbacConfig | nindent 4 }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml index 3bb94c5f..6d4c3901 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml @@ -8,7 +8,7 @@ metadata: helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} + app.kubernetes.io/part-of: argocd app.kubernetes.io/component: {{ .Values.server.name }} type: Opaque {{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketSecret) }} diff --git a/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml index 30d6502c..cf424661 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml @@ -7,6 +7,6 @@ metadata: helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} + app.kubernetes.io/part-of: argocd app.kubernetes.io/component: {{ .Values.server.name }} name: argocd-ssh-known-hosts-cm \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml index 01922612..e36fab55 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml @@ -9,6 +9,6 @@ metadata: helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} + app.kubernetes.io/part-of: argocd app.kubernetes.io/component: {{ .Values.server.name }} name: argocd-tls-certs-cm \ No newline at end of file