diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index 4bf8c39b..2acfa9cc 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/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.9 +version: 0.3.10 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml index 595fe120..c2c2df64 100644 --- a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml +++ b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml @@ -2,12 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Release.Name }} - {{- if .Values.podAnnotations }} - annotations: - {{- range $key, $value := .Values.podAnnotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} labels: app.kubernetes.io/component: {{ .Values.controller.component }} app.kubernetes.io/name: {{ .Release.Name }} @@ -21,6 +15,12 @@ spec: app.kubernetes.io/name: {{ .Release.Name }} template: metadata: + {{- if .Values.podAnnotations }} + annotations: + {{- range $key, $value := .Values.podAnnotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} labels: app.kubernetes.io/name: {{ .Release.Name }} spec: diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 76a5299a..97e2f28c 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v2.11.7 description: A Helm chart for Argo Workflows name: argo -version: 0.13.10 +version: 0.13.11 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml index dda3df94..82b36bf6 100755 --- a/charts/argo/templates/workflow-controller-deployment.yaml +++ b/charts/argo/templates/workflow-controller-deployment.yaml @@ -61,6 +61,9 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace + {{- with .Values.controller.extraEnv }} + {{ toYaml . | nindent 10 }} + {{- end }} resources: {{- toYaml .Values.controller.resources | nindent 12 }} {{- if .Values.controller.metricsConfig.enabled }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 67c9af29..cd7d7603 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -115,6 +115,9 @@ controller: # service type `LoadBalancer` loadBalancerSourceRanges: [] resources: {} + # The list of environment variable definitions to be added to the controller + # manages container verbatim. + extraEnv: [] replicas: 1 pdb: enabled: false