Merge branch 'master' into master

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.5
+version: 2.3.6
 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-server/route.yaml

@@ -26,6 +26,4 @@ spec:
     termination: {{ .Values.server.route.termination_type | default "passthrough" }}
     insecureEdgeTerminationPolicy: {{ .Values.server.route.termination_policy | default "None" }} 
   wildcardPolicy: None
-status:
-  ingress: []
 {{- end }}

charts/argo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v2.8.0
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.9.5
+version: 0.9.6
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:

charts/argo/templates/workflow-controller-config-map.yaml

@@ -25,8 +25,8 @@ data:
       env: {{- toYaml . | nindent 8 }}
       {{- end }}
     {{- end }}
+    {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}
     artifactRepository:
-      {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}
       {{- if .Values.artifactRepository.archiveLogs }}
       archiveLogs: {{ .Values.artifactRepository.archiveLogs }}
       {{- end }}
@@ -54,7 +54,7 @@ data:
         {{- if .Values.artifactRepository.s3.useSDKCreds }}
         useSDKCreds: {{ .Values.artifactRepository.s3.useSDKCreds }}
         {{- end }}
-      {{- end}}
+    {{- end}}
     {{- if .Values.controller.metricsConfig.enabled }}
     metricsConfig:
 {{ toYaml .Values.controller.metricsConfig | indent 6}}{{- end }}