Merge remote-tracking branch 'upstream/master' into feature/charts/argo/suppport-helm3

Signed-off-by: clement <clement@le-corre.eu>

charts/argo-rollouts/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.9.1"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 0.3.8
+version: 0.3.9
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:

charts/argo-rollouts/templates/argo-rollouts-aggregate-roles.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.clusterInstall }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -75,3 +76,4 @@ rules:
   - patch
   - update
   - watch
+{{- end }}

charts/argo/Chart.yaml

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

charts/argo/templates/server-deployment.yaml

@@ -38,6 +38,9 @@ spec:
           {{- if .Values.server.extraArgs }}
           {{- toYaml .Values.server.extraArgs | nindent 10 }}
           {{- end }}
+          {{- if .Values.server.secure }}
+          - "--secure"
+          {{- end }}
           {{- if .Values.singleNamespace }}
           - "--namespaced"
           {{- end }}
@@ -52,7 +55,11 @@ spec:
             httpGet:
               path: /
               port: 2746
+              {{- if .Values.server.secure }}
+              scheme: HTTPS
+              {{- else }}
               scheme: HTTP
+              {{- end }}
             initialDelaySeconds: 10
             periodSeconds: 20
           env:

charts/argo/values.yaml

@@ -201,6 +201,12 @@ server:
   # PriorityClass: system-cluster-critical
   priorityClassName: ""
 
+  # Run the argo server in "secure" mode. Configure this value instead of
+  # "--secure" in extraArgs. See the following documentation for more details
+  # on secure mode:
+  # https://argoproj.github.io/argo/tls/#encrypted
+  secure: false
+
   # Extra arguments to provide to the Argo server binary.
   extraArgs: []