From 0320fede59a3703de73f1950805388f9f8e4a6c4 Mon Sep 17 00:00:00 2001 From: Karen Almog Date: Mon, 19 Aug 2019 15:03:08 +0200 Subject: [PATCH] add admin password and tls values to argocd admin-secret.yaml --- charts/argo-cd/templates/argocd-secret.yaml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/templates/argocd-secret.yaml b/charts/argo-cd/templates/argocd-secret.yaml index c693d079..b206f515 100755 --- a/charts/argo-cd/templates/argocd-secret.yaml +++ b/charts/argo-cd/templates/argocd-secret.yaml @@ -2,14 +2,29 @@ apiVersion: v1 kind: Secret metadata: name: argocd-secret - labels: + labels: app.kubernetes.io/name: {{ include "argo-cd.name" . }} 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" . }} type: Opaque -data: +data: +{{- if .Values.config.admin.password }} + admin.password: {{ .Values.config.admin.password }} +{{- end }} +{{- if .Values.config.admin.passwordMtime }} + admin.passwordMtime: {{ .Values.config.admin.passwordMtime }} +{{- end }} +{{- if .Values.config.server.secretkey }} + server.secretkey: {{ .Values.config.server.secretkey }} +{{- end }} +{{- if .Values.config.tls.crt }} + tls.crt: {{ .Values.config.tls.crt }} +{{- end }} +{{- if .Values.config.tls.key }} + tls.key: {{ .Values.config.tls.key }} +{{- end }} {{- if .Values.config.webhook.githubSecret }} github.webhook.secret: {{ .Values.config.webhook.githubSecret }} {{- end }} @@ -18,4 +33,4 @@ data: {{- end }} {{- if .Values.config.webhook.bitbucketSecret }} bitbucket.webhook.uuid: {{ .Values.config.webhook.bitbucketSecret }} -{{- end }} \ No newline at end of file +{{- end }}