add encrypt values for secret section

Signed-off-by: akastav <switch@bk.ru>
This commit is contained in:
akastav 2021-06-03 12:42:24 +03:00
parent 44aa7ed710
commit 8409e2e1d2
3 changed files with 9 additions and 3 deletions

View file

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
appVersion: 2.0.3 appVersion: 2.0.4
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.6.6 version: 3.6.7
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:

View file

@ -14,7 +14,11 @@ metadata:
type: Opaque type: Opaque
{{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig .Values.configs.secret.extra) }} {{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig .Values.configs.secret.extra) }}
# Setting a blank data again will wipe admin password/key/cert # Setting a blank data again will wipe admin password/key/cert
{{- if .Values.configs.secret.encrypt }}
data: data:
{{- else }}
stringData:
{{- end }}
{{- if .Values.configs.secret.githubSecret }} {{- if .Values.configs.secret.githubSecret }}
webhook.github.secret: {{ .Values.configs.secret.githubSecret | b64enc }} webhook.github.secret: {{ .Values.configs.secret.githubSecret | b64enc }}
{{- end }} {{- end }}

View file

@ -11,7 +11,7 @@ installCRDs: true
global: global:
image: image:
repository: quay.io/argoproj/argocd repository: quay.io/argoproj/argocd
tag: v2.0.3 tag: v2.0.4
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
securityContext: {} securityContext: {}
# runAsUser: 999 # runAsUser: 999
@ -1048,6 +1048,8 @@ configs:
# -----END RSA PRIVATE KEY----- # -----END RSA PRIVATE KEY-----
secret: secret:
createSecret: true createSecret: true
# Use secret with stringData instead data, without base64 encryptions
encrypt: true
## Annotations to be added to argocd-secret ## Annotations to be added to argocd-secret
## ##
annotations: {} annotations: {}