Merge branch 'master' into loadbalancer-source-range-typo

charts/argo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "v2.7.6"
+appVersion: v2.8.0
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.8.6
+version: 0.9.1
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:

charts/argo/crds/cluster-workflow-template-crd.yaml

@@ -0,0 +1,17 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterworkflowtemplates.argoproj.io
+  annotations:
+    helm.sh/hook: crd-install
+    helm.sh/hook-delete-policy: before-hook-creation
+spec:
+  group: argoproj.io
+  version: v1alpha1
+  scope: Cluster
+  names:
+    kind: ClusterWorkflowTemplate
+    plural: clusterworkflowtemplates
+    shortNames:
+    - clusterwftmpl
+    - cwft

charts/argo/templates/cluster-workflow-template-crd.yaml

@@ -0,0 +1,19 @@
+{{- if .Values.installCRD }}
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterworkflowtemplates.argoproj.io
+  annotations:
+    helm.sh/hook: crd-install
+    helm.sh/hook-delete-policy: before-hook-creation
+spec:
+  group: argoproj.io
+  version: v1alpha1
+  scope: Cluster
+  names:
+    kind: ClusterWorkflowTemplate
+    plural: clusterworkflowtemplates
+    shortNames:
+    - clusterwftmpl
+    - cwft
+{{- end }}

charts/argo/templates/server-cluster-role.yaml

@@ -58,6 +58,7 @@ rules:
   - workflows
   - workflowtemplates
   - cronworkflows
+  - clusterworkflowtemplates
   verbs:
   - create
   - get

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

@@ -18,6 +18,8 @@ rules:
   - workflowtemplates/finalizers
   - cronworkflows
   - cronworkflows/finalizers
+  - clusterworkflowtemplates
+  - clusterworkflowtemplates/finalizers
   verbs:
   - get
   - list
@@ -42,6 +44,8 @@ rules:
   - workflowtemplates/finalizers
   - cronworkflows
   - cronworkflows/finalizers
+  - clusterworkflowtemplates
+  - clusterworkflowtemplates/finalizers
   verbs:
   - create
   - delete
@@ -71,6 +75,8 @@ rules:
   - workflowtemplates/finalizers
   - cronworkflows
   - cronworkflows/finalizers
+  - clusterworkflowtemplates
+  - clusterworkflowtemplates/finalizers
   verbs:
   - create
   - delete

charts/argo/templates/workflow-controller-clusterrole.yaml

@@ -55,6 +55,8 @@ rules:
   resources:
   - workflowtemplates
   - workflowtemplates/finalizers
+  - clusterworkflowtemplates
+  - clusterworkflowtemplates/finalizers
   verbs:
   - get
   - list

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

@@ -16,10 +16,14 @@ data:
     {{- end }}
     {{- end }}
     containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }}
-    {{- with .Values.executor.resources }}
+    {{- if or .Values.executor.resources .Values.executor.env }}
     executor:
-      resources:
-        {{- toYaml . | nindent 8 }}
+      {{- with .Values.executor.resources }}
+      resources: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.executor.env }}
+      env: {{- toYaml . | nindent 8 }}
+      {{- end }}
     {{- end }}
     artifactRepository:
       {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}

charts/argo/values.yaml

@@ -111,6 +111,8 @@ executor:
     # Overrides .images.tag if defined.
     tag: ""
   resources: {}
+  # Adds environment variables for the executor.
+  env: {}
 
 server:
   enabled: true