merged upstream master into branch

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.3.0"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.2.5
+version: 1.2.4
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 keywords:

charts/argo-cd/templates/argocd-configs/argocd-secret.yaml

@@ -11,7 +11,11 @@ metadata:
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.server.name }}
 type: Opaque
+<<<<<<< HEAD
 {{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketSecret .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig) }}
+=======
+{{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketSecret) }}
+>>>>>>> 5330efa6d8401074e250f3ecd2741c0bfbb6b692
 # Setting a blank data again will wipe admin password/key/cert
 data:
   {{- if .Values.configs.secret.githubSecret }}
@@ -23,6 +27,7 @@ data:
   {{- if .Values.configs.secret.bitbucketSecret }}
   bitbucket.webhook.uuid: {{ .Values.configs.secret.bitbucketSecret | b64enc }}
   {{- end }}
+<<<<<<< HEAD
   {{- if .Values.configs.secret.argocdServerTlsConfig }}
   tls.key: {{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }}
   tls.crt: {{ .Values.configs.secret.argocdServerTlsConfig.crt | b64enc }}
@@ -34,3 +39,7 @@ data:
   {{- end }}
 {{- end }}
 {{- end }}
+=======
+{{- end }}
+{{- end }}
+>>>>>>> 5330efa6d8401074e250f3ecd2741c0bfbb6b692

charts/argo-cd/values.yaml

@@ -608,9 +608,17 @@ configs:
     githubSecret: ""
     gitlabSecret: ""
     bitbucketSecret: ""
-#   argocdServerTlsConfig:
+  # Argo TLS Data. 
-#     key:
+  # argocdServerTlsConfig:
-#     crt:
+  #   key:
-    # Argo expects the password in the secret to be bcrypt hashed. You can create this hash with
+  #   crt: |
-    # `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'`
+  #     -----BEGIN CERTIFICATE-----
-#   argocdServerAdminPassword:
+  #     <cert data>
+  #     -----END CERTIFICATE-----
+  #     -----BEGIN CERTIFICATE-----
+  #     <ca cert data>
+  #     -----END CERTIFICATE-----
+
+  # Argo expects the password in the secret to be bcrypt hashed. You can create this hash with
+  # `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'`
+  # argocdServerAdminPassword: