Merge branch 'master' into fix-persistence-archive-option

charts/argo-cd/Chart.yaml

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

charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.controller.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,3 +10,4 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.controller.name }}
+{{- end }}

charts/argo-cd/templates/argocd-server/serviceaccount.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.server.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,3 +10,4 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.server.name }}
+{{- end }}

charts/argo-cd/templates/dex/serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.dex.enabled }}
+{{- if .Values.dex.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

charts/argo-cd/values.yaml

@@ -160,7 +160,7 @@ controller:
     #   additionalLabels: {}
 
   ## Enable Admin ClusterRole resources.
-  ## Enable if you would like to grant rights to ArgoCD to deploy to the local kuberentes cluster.
+  ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster.
   clusterAdminAccess:
     enabled: true
 
@@ -564,7 +564,7 @@ server:
   #   roles: []
 
   ## Enable Admin ClusterRole resources.
-  ## Enable if you would like to grant rights to ArgoCD to deploy to the local kuberentes cluster.
+  ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster.
   clusterAdminAccess:
     enabled: true
 

charts/argo/values.yaml

@@ -40,6 +40,8 @@ controller:
   #   maxOpenConns: 0
   # # save the entire workflow into etcd and DB
   # nodeStatusOffLoad: false
+  # # enable archiving of old workflows
+  # archive: false
   # postgresql:
   #   host: localhost
   #   port: 5432