From 8deaa0a119b65b5cd4320ceb74387d3642f7f572 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Mon, 31 May 2021 18:06:26 +0200
Subject: [PATCH 1/5] feat(argo-rollouts): Update manifests for v1.0.1 (#752)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(argo-rollouts): Update manifests for v1.0.1

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* fix: add template function for labels

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* fix: Apply changes from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>
---
 charts/argo-rollouts/Chart.yaml               |  6 +-
 charts/argo-rollouts/README.md                | 65 ++++++++++++-------
 charts/argo-rollouts/templates/_helpers.tpl   | 32 +++++++++
 .../argo-rollouts-aggregate-roles.yaml        | 21 +++---
 .../templates/argo-rollouts-clusterrole.yaml  | 27 +++++++-
 .../argo-rollouts-clusterrolebinding.yaml     |  9 ++-
 .../templates/argo-rollouts-deployment.yaml   | 38 ++++++-----
 .../argo-rollouts-metrics-service.yaml        | 13 ++--
 .../templates/argo-rollouts-role.yaml         |  7 +-
 .../templates/argo-rollouts-rolebinding.yaml  | 11 ++--
 .../templates/argo-rollouts-sa.yaml           | 11 +++-
 .../argo-rollouts-service-monitor.yaml        | 16 ++---
 .../templates/crds/analysis-run-crd.yaml      |  9 ++-
 .../templates/crds/analysis-template-crd.yaml |  9 ++-
 .../crds/cluster-analysis-template-crd.yaml   |  9 ++-
 .../templates/crds/experiment-crd.yaml        |  4 +-
 .../templates/crds/rollout-crd.yaml           | 41 ++++++++++--
 charts/argo-rollouts/values.yaml              | 27 +++++++-
 18 files changed, 248 insertions(+), 107 deletions(-)

diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml
index d7fd46ac..65f30638 100644
--- a/charts/argo-rollouts/Chart.yaml
+++ b/charts/argo-rollouts/Chart.yaml
@@ -1,8 +1,8 @@
-apiVersion: v1
-appVersion: "0.10.2"
+apiVersion: v2
+appVersion: "v1.0.1"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 0.5.5
+version: 1.0.0
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md
index 91d7b9ad..47da9c14 100644
--- a/charts/argo-rollouts/README.md
+++ b/charts/argo-rollouts/README.md
@@ -1,12 +1,11 @@
-Argo Rollouts Chart
-=============
-A Helm chart for Argo Rollouts, progressive delivery for Kubernetes.
+# Argo Rollouts Chart
 
-Current chart version is `0.5.4`
+A Helm chart for Argo Rollouts, progressive delivery for Kubernetes.
 
 Source code can be found [here](https://github.com/argoproj/argo-rollouts)
 
 ## Additional Information
+
 This is a **community maintained** chart. This chart installs [argo-rollouts](https://argoproj.github.io/argo-rollouts/), progressive delivery for Kubernetes.
 
 The default installation is intended to be similar to the provided Argo Rollouts [releases](https://github.com/argoproj/argo-rollouts/releases).
@@ -14,6 +13,7 @@ The default installation is intended to be similar to the provided Argo Rollouts
 ## Prerequisites
 
 - Kubernetes 1.7+
+- Helm v3.0.0+
 
 
 ## Installing the Chart
@@ -22,27 +22,48 @@ To install the chart with the release name `my-release`:
 
 ```console
 $ helm repo add argo https://argoproj.github.io/argo-helm
-$ helm install --name my-release argo/argo-rollouts
+$ helm install my-release argo/argo-rollouts
 ```
 
 ## Chart Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| clusterInstall | bool | `true` |  |
-| controller.component | string | `"rollouts-controller"` |  |
-| controller.image.pullPolicy | string | `"IfNotPresent"` |  |
-| controller.image.repository | string | `"argoproj/argo-rollouts"` |  |
-| controller.image.tag | string | `"v0.10.2"` |  |
-| controller.name | string | `"argo-rollouts"` |  |
-| controller.resources | Resource limits and requests for the controller pods. | `{}` |
-| controller.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
-| controller.affinity | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) | `{}` |
-| controller.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |
-| controller.metrics.serviceMonitor.enabled | bool | `false` |  |
-| imagePullSecrets | list | `[]` |  |
-| installCRDs | bool | `true` |  |
-| crdAnnotations | object | `{}` |  |
-| podAnnotations | object | `{}` |  |
-| podLabels | object | `{}` |  |
-| serviceAccount.name | string | `"argo-rollouts"` |  |
+| clusterInstall | bool | `true` | `false` runs controller in namespaced mode (does not require cluster RBAC) |
+| controller.component | string | `"rollouts-controller"` | Value of label `app.kubernetes.io/component` |
+| controller.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| controller.image.registry | string | `quay.io` | Registry to use |
+| controller.image.repository | string | `"argoproj/argo-rollouts"` | Repository to use |
+| controller.image.tag | string | `""` | Overrides the image tag (default is the chart appVersion) |
+| controller.resources | object | `{}` | Resource limits and requests for the controller pods. |
+| controller.tolerations | list | `[]` | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) |
+| controller.affinity | object | `{}` | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) |
+| controller.nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) |
+| controller.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor |
+| controller.metrics.serviceMonitor.additionalAnnotations | object | `{}` | Annotations to be added to the ServiceMonitor |
+| controller.metrics.serviceMonitor.additionalLabels | object | `{}` | Labels to be added to the ServiceMonitor |
+| imagePullSecrets | list | `[]` | Registry secret names as an array |
+| installCRDs | bool | `true` | Install and upgrade CRDs |
+| crdAnnotations | object | `{}` | Annotations to be added to all CRDs |
+| podAnnotations | object | `{}` | Annotations to be added to the Rollout pods |
+| podLabels | object | `{}` | Labels to be added to the Rollout pods |
+| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
+| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
+| podSecurityContext | object | `{"runAsNonRoot": true}` | Security Context to set on pod level |
+| containerSecurityContext | object | `{}` | Security Context to set on container level |
+
+## Upgrading
+
+### To 1.0.0
+
+* This is a breaking change which only supports Helm v3.0.0+ now. If you still use Helm v2, please consider upgrading because v2 is EOL since November 2020.  
+  To migrate to Helm v3 please have a look at the [Helm 2to3 Plugin](https://github.com/helm/helm-2to3). This tool will convert the existing ConfigMap used for Tiller to a Secret of type `helm.sh/release.v1`.
+* `quay.io` is the default registry now
+* We introduce a template function for the labels here to reduce code duplication. This also affects the Deployment `matchLabels` selector.  
+  To upgrade an existing installation, please **add the `--force` parameter** to the `helm upgrade` command or **delete the Deployment resource** before you upgrade. This is necessary because Deployment's label selector is immutable.
+* All resources are now prefixed with the template `"argo-rollouts.fullname"`.
+  This enables the users to override resource names via the `nameOverride` and `fullnameOverride` parameters.
+* Breaking parameters update
+  * `securityContext` was renamed to `containerSecurityContext`
+  * Added `controller.image.registry`. Prior to this chart version you had to override the registry via `controller.image.repository`
diff --git a/charts/argo-rollouts/templates/_helpers.tpl b/charts/argo-rollouts/templates/_helpers.tpl
index 48744885..2e5153b5 100644
--- a/charts/argo-rollouts/templates/_helpers.tpl
+++ b/charts/argo-rollouts/templates/_helpers.tpl
@@ -30,3 +30,35 @@ Create chart name and version as used by the chart label.
 {{- define "argo-rollouts.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "argo-rollouts.labels" -}}
+helm.sh/chart: {{ include "argo-rollouts.chart" . }}
+{{ include "argo-rollouts.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/part-of: argo-rollouts
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "argo-rollouts.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "argo-rollouts.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "argo-rollouts.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "argo-rollouts.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/argo-rollouts/templates/argo-rollouts-aggregate-roles.yaml b/charts/argo-rollouts/templates/argo-rollouts-aggregate-roles.yaml
index 715aa001..ab3ac6dd 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-aggregate-roles.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-aggregate-roles.yaml
@@ -2,12 +2,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-aggregate-to-view
+  name: {{ include "argo-rollouts.fullname" . }}-aggregate-to-view
   labels:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
-    app.kubernetes.io/component: aggregate-cluster-role
-    app.kubernetes.io/name:  {{ .Release.Name }}-aggregate-to-view
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/component: {{ .Values.controller.component }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - argoproj.io
@@ -27,12 +26,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-aggregate-to-edit
+  name: {{ include "argo-rollouts.fullname" . }}-aggregate-to-edit
   labels:
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    app.kubernetes.io/component: aggregate-cluster-role
-    app.kubernetes.io/name:  {{ .Release.Name }}-aggregate-to-edit
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/component: {{ .Values.controller.component }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - argoproj.io
@@ -58,12 +56,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-aggregate-to-admin
+  name: {{ include "argo-rollouts.fullname" . }}-aggregate-to-admin
   labels:
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/component: aggregate-cluster-role
-    app.kubernetes.io/name:  {{ .Release.Name }}-aggregate-to-admin
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/component: {{ .Values.controller.component }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - argoproj.io
diff --git a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml
index c3fb9f0c..5872d59d 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml
@@ -2,11 +2,10 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-clusterrole
+  name: {{ include "argo-rollouts.fullname" . }}
   labels:
     app.kubernetes.io/component: {{ .Values.controller.component }}
-    app.kubernetes.io/name: {{ .Release.Name }}-clusterrole
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - argoproj.io
@@ -57,6 +56,16 @@ rules:
   - update
   - patch
   - delete
+- apiGroups:
+  - ""
+  - apps
+  resources:
+  - deployments
+  - podtemplates
+  verbs:
+  - get
+  - list
+  - watch
 # services patch needed to update selector of canary/stable/active/preview services
 - apiGroups:
   - ""
@@ -135,6 +144,7 @@ rules:
   - watch
   - get
   - update
+  - patch
   - list
 # trafficsplit access needed for using the SMI provider
 - apiGroups:
@@ -147,4 +157,15 @@ rules:
   - get
   - update
   - patch
+- apiGroups:
+  - getambassador.io
+  resources:
+  - mappings
+  verbs:
+  - create
+  - watch
+  - get
+  - update
+  - list
+  - delete
 {{- end }}
diff --git a/charts/argo-rollouts/templates/argo-rollouts-clusterrolebinding.yaml b/charts/argo-rollouts/templates/argo-rollouts-clusterrolebinding.yaml
index 1d446845..b48ce5b5 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-clusterrolebinding.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-clusterrolebinding.yaml
@@ -2,17 +2,16 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ .Release.Name }}-clusterrolebinding
+  name: {{ include "argo-rollouts.fullname" . }}
   labels:
     app.kubernetes.io/component: {{ .Values.controller.component }}
-    app.kubernetes.io/name: {{ .Release.Name }}-clusterrolebinding
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Release.Name }}-clusterrole
+  name: {{ include "argo-rollouts.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ .Values.serviceAccount.name }}
+  name: {{ include "argo-rollouts.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- end }}
diff --git a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
index 87c84929..fb632312 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
@@ -1,50 +1,54 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "argo-rollouts.fullname" . }}
   labels:
     app.kubernetes.io/component: {{ .Values.controller.component }}
-    app.kubernetes.io/name: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    {{- if .Values.podLabels }}
-{{- toYaml .Values.podLabels | nindent 4 }}
-    {{- end }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ .Release.Name }}
+      {{- include "argo-rollouts.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
   template:
     metadata:
-      {{- if .Values.podAnnotations }}
+      {{- with .Values.podAnnotations }}
       annotations:
-      {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ $value | quote }}
-      {{- end }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app.kubernetes.io/name: {{ .Release.Name }}
+        {{- include "argo-rollouts.selectorLabels" . | nindent 8 }}
+        {{- range $key, $value := .Values.podLabels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ .Values.serviceAccount.name }}
+      serviceAccountName: {{ include "argo-rollouts.serviceAccountName" . }}
       containers:
-      - image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
+      - image: "{{ .Values.controller.image.registry }}/{{ .Values.controller.image.repository }}:{{ default .Chart.AppVersion .Values.controller.image.tag }}"
         {{- if not .Values.clusterInstall }}
         args:
         - --namespaced
         {{- end }}
         imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
-        name: {{ .Values.controller.name }}
+        name: argo-rollouts
+        ports:
+        - containerPort: 8090
+          name: metrics
         securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
+          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
         resources:
           {{- toYaml .Values.controller.resources | nindent 10 }}
       {{- if .Values.controller.nodeSelector }}
       nodeSelector:
         {{- toYaml .Values.controller.nodeSelector | nindent 8 }}
       {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       {{- if .Values.controller.tolerations }}
       tolerations:
         {{- toYaml .Values.controller.tolerations | nindent 8 }}
@@ -53,5 +57,3 @@ spec:
       affinity:
         {{- toYaml .Values.controller.affinity | nindent 8 }}
       {{- end }}
-  strategy:
-    type: Recreate
diff --git a/charts/argo-rollouts/templates/argo-rollouts-metrics-service.yaml b/charts/argo-rollouts/templates/argo-rollouts-metrics-service.yaml
index 4301b7c8..df6d1291 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-metrics-service.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-metrics-service.yaml
@@ -1,14 +1,14 @@
+{{- if .Values.controller.metrics.serviceMonitor.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-metrics
+  name: {{ include "argo-rollouts.fullname" . }}-metrics
   labels:
     app.kubernetes.io/component: server
-    app.kubernetes.io/name: {{ .Release.Name }}-metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
+  {{- with .Values.serviceAnnotations }}
   annotations:
-  {{- range $key, $value := .Values.serviceAnnotations }}
-    {{ $key }}: {{ $value | quote }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   ports:
@@ -17,4 +17,5 @@ spec:
     port: 8090
     targetPort: 8090
   selector:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    {{- include "argo-rollouts.selectorLabels" . | nindent 6 }}
+{{- end }}
diff --git a/charts/argo-rollouts/templates/argo-rollouts-role.yaml b/charts/argo-rollouts/templates/argo-rollouts-role.yaml
index 4c80d507..a981d95d 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-role.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-role.yaml
@@ -1,11 +1,11 @@
+{{- if not .Values.clusterInstall }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ .Release.Name }}-role
+  name: {{ include "argo-rollouts.fullname" . }}
   labels:
     app.kubernetes.io/component: {{ .Values.controller.component }}
-    app.kubernetes.io/name: {{ .Release.Name }}-role
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - argoproj.io
@@ -145,3 +145,4 @@ rules:
   - get
   - update
   - patch
+{{- end }}
diff --git a/charts/argo-rollouts/templates/argo-rollouts-rolebinding.yaml b/charts/argo-rollouts/templates/argo-rollouts-rolebinding.yaml
index ddc0e27d..128df3ab 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-rolebinding.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-rolebinding.yaml
@@ -1,15 +1,16 @@
+{{- if not .Values.clusterInstall }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ .Release.Name }}-role-binding
+  name: {{ include "argo-rollouts.fullname" . }}
   labels:
     app.kubernetes.io/component: {{ .Values.controller.component }}
-    app.kubernetes.io/name: {{ .Release.Name }}-role-binding
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ .Release.Name }}-role
+  name: {{ include "argo-rollouts.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ .Values.serviceAccount.name }}
+  name: {{ include "argo-rollouts.serviceAccountName" . }}
+{{- end }}
diff --git a/charts/argo-rollouts/templates/argo-rollouts-sa.yaml b/charts/argo-rollouts/templates/argo-rollouts-sa.yaml
index dca70793..327eb6a5 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-sa.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-sa.yaml
@@ -1,8 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.serviceAccount.name }}
+  name: {{ include "argo-rollouts.serviceAccountName" . }}
   labels:
     app.kubernetes.io/component: {{ .Values.controller.component }}
-    app.kubernetes.io/name: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/argo-rollouts/templates/argo-rollouts-service-monitor.yaml b/charts/argo-rollouts/templates/argo-rollouts-service-monitor.yaml
index ea67f356..bf6fae81 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-service-monitor.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-service-monitor.yaml
@@ -2,17 +2,16 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "argo-rollouts.fullname" . }}
   labels:
     app.kubernetes.io/component: server
-    app.kubernetes.io/name: {{ .Release.Name }}-metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
-{{ toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | indent 4 }}
+    {{- include "argo-rollouts.labels" . | nindent 4 }}
+    {{- range $key, $value := .Values.controller.metrics.serviceMonitor.additionalLabels }}
+    {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.controller.metrics.serviceMonitor.additionalAnnotations }}
+  {{- with .Values.controller.metrics.serviceMonitor.additionalAnnotations }}
   annotations:
-{{ toYaml .Values.controller.metrics.serviceMonitor.additionalAnnotations | indent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   endpoints:
@@ -23,6 +22,5 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: server
-      app.kubernetes.io/name: {{ .Release.Name }}-metrics
-      app.kubernetes.io/part-of: {{ .Release.Name }}
+      {{- include "argo-rollouts.selectorLabels" . | nindent 6 }}
 {{- end }}
diff --git a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml
index bd717905..08786ca0 100644
--- a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml
@@ -3,9 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
+    controller-gen.kubebuilder.io/version: v0.5.0
     {{- if .Values.crdAnnotations }}
-{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- toYaml .Values.crdAnnotations | nindent 4 }}
     {{- end }}
   labels:
     app.kubernetes.io/name: argo-rollouts
@@ -2308,6 +2308,7 @@ spec:
                                       start:
                                         type: string
                                       step:
+                                        format: int64
                                         type: integer
                                     required:
                                     - end
@@ -2327,6 +2328,7 @@ spec:
                                       start:
                                         type: string
                                       step:
+                                        format: int64
                                         type: integer
                                     required:
                                     - end
@@ -2348,8 +2350,10 @@ spec:
                             threshold:
                               properties:
                                 marginal:
+                                  format: int64
                                   type: integer
                                 pass:
+                                  format: int64
                                   type: integer
                               required:
                               - marginal
@@ -2407,6 +2411,7 @@ spec:
                             jsonPath:
                               type: string
                             timeoutSeconds:
+                              format: int64
                               type: integer
                             url:
                               type: string
diff --git a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml
index b1484066..12fc5340 100644
--- a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml
@@ -3,9 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
+    controller-gen.kubebuilder.io/version: v0.5.0
     {{- if .Values.crdAnnotations }}
-{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- toYaml .Values.crdAnnotations | nindent 4 }}
     {{- end }}
   labels:
     app.kubernetes.io/name: argo-rollouts
@@ -2303,6 +2303,7 @@ spec:
                                       start:
                                         type: string
                                       step:
+                                        format: int64
                                         type: integer
                                     required:
                                     - end
@@ -2322,6 +2323,7 @@ spec:
                                       start:
                                         type: string
                                       step:
+                                        format: int64
                                         type: integer
                                     required:
                                     - end
@@ -2343,8 +2345,10 @@ spec:
                             threshold:
                               properties:
                                 marginal:
+                                  format: int64
                                   type: integer
                                 pass:
+                                  format: int64
                                   type: integer
                               required:
                               - marginal
@@ -2402,6 +2406,7 @@ spec:
                             jsonPath:
                               type: string
                             timeoutSeconds:
+                              format: int64
                               type: integer
                             url:
                               type: string
diff --git a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml
index 0dbc04aa..e357b4d2 100644
--- a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml
@@ -3,9 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
+    controller-gen.kubebuilder.io/version: v0.5.0
     {{- if .Values.crdAnnotations }}
-{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- toYaml .Values.crdAnnotations | nindent 4 }}
     {{- end }}
   labels:
     app.kubernetes.io/name: argo-rollouts
@@ -2303,6 +2303,7 @@ spec:
                                       start:
                                         type: string
                                       step:
+                                        format: int64
                                         type: integer
                                     required:
                                     - end
@@ -2322,6 +2323,7 @@ spec:
                                       start:
                                         type: string
                                       step:
+                                        format: int64
                                         type: integer
                                     required:
                                     - end
@@ -2343,8 +2345,10 @@ spec:
                             threshold:
                               properties:
                                 marginal:
+                                  format: int64
                                   type: integer
                                 pass:
+                                  format: int64
                                   type: integer
                               required:
                               - marginal
@@ -2402,6 +2406,7 @@ spec:
                             jsonPath:
                               type: string
                             timeoutSeconds:
+                              format: int64
                               type: integer
                             url:
                               type: string
diff --git a/charts/argo-rollouts/templates/crds/experiment-crd.yaml b/charts/argo-rollouts/templates/crds/experiment-crd.yaml
index b78f5cb4..5f9f8cfc 100644
--- a/charts/argo-rollouts/templates/crds/experiment-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/experiment-crd.yaml
@@ -3,9 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
+    controller-gen.kubebuilder.io/version: v0.5.0
     {{- if .Values.crdAnnotations }}
-{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- toYaml .Values.crdAnnotations | nindent 4 }}
     {{- end }}
   labels:
     app.kubernetes.io/name: argo-rollouts
diff --git a/charts/argo-rollouts/templates/crds/rollout-crd.yaml b/charts/argo-rollouts/templates/crds/rollout-crd.yaml
index 772a1a59..10d0a8e1 100644
--- a/charts/argo-rollouts/templates/crds/rollout-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/rollout-crd.yaml
@@ -3,9 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
+    controller-gen.kubebuilder.io/version: v0.5.0
     {{- if .Values.crdAnnotations }}
-{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- toYaml .Values.crdAnnotations | nindent 4 }}
     {{- end }}
   labels:
     app.kubernetes.io/name: argo-rollouts
@@ -32,11 +32,13 @@ spec:
       jsonPath: .status.replicas
       name: Current
       type: integer
-    - description: Total number of non-terminated pods targeted by this rollout that have the desired template spec
+    - description: Total number of non-terminated pods targeted by this rollout that
+        have the desired template spec
       jsonPath: .status.updatedReplicas
       name: Up-to-date
       type: integer
-    - description: Total number of available pods (ready for at least minReadySeconds) targeted by this rollout
+    - description: Total number of available pods (ready for at least minReadySeconds)
+        targeted by this rollout
       jsonPath: .status.availableReplicas
       name: Available
       type: integer
@@ -303,6 +305,12 @@ spec:
                         - type: integer
                         - type: string
                         x-kubernetes-int-or-string: true
+                      scaleDownDelayRevisionLimit:
+                        format: int32
+                        type: integer
+                      scaleDownDelaySeconds:
+                        format: int32
+                        type: integer
                       stableMetadata:
                         properties:
                           annotations:
@@ -490,6 +498,15 @@ spec:
                             - ingress
                             - servicePort
                             type: object
+                          ambassador:
+                            properties:
+                              mappings:
+                                items:
+                                  type: string
+                                type: array
+                            required:
+                            - mappings
+                            type: object
                           istio:
                             properties:
                               destinationRule:
@@ -2651,9 +2668,15 @@ spec:
                     - containers
                     type: object
                 type: object
-            required:
-            - selector
-            - template
+              workloadRef:
+                properties:
+                  apiVersion:
+                    type: string
+                  kind:
+                    type: string
+                  name:
+                    type: string
+                type: object
             type: object
           status:
             properties:
@@ -2768,6 +2791,8 @@ spec:
               currentStepIndex:
                 format: int32
                 type: integer
+              message:
+                type: string
               observedGeneration:
                 type: string
               pauseConditions:
@@ -2783,6 +2808,8 @@ spec:
                   - startTime
                   type: object
                 type: array
+              phase:
+                type: string
               promoteFull:
                 type: boolean
               readyReplicas:
diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml
index a3200728..3e2a4769 100644
--- a/charts/argo-rollouts/values.yaml
+++ b/charts/argo-rollouts/values.yaml
@@ -3,7 +3,6 @@ installCRDs: true
 clusterInstall: true
 
 controller:
-  name: argo-rollouts
   component: rollouts-controller
   ## Node selectors and tolerations for server scheduling to nodes with taints
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
@@ -12,8 +11,9 @@ controller:
   tolerations: []
   affinity: {}
   image:
+    registry: quay.io
     repository: argoproj/argo-rollouts
-    tag: v0.10.2
+    tag: ""
     pullPolicy: IfNotPresent
 
   resources: {}
@@ -31,7 +31,13 @@ controller:
       additionalAnnotations: {}
 
 serviceAccount:
-  name: argo-rollouts
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
 
 ## Annotations to be added to all CRDs
 ##
@@ -41,6 +47,21 @@ crdAnnotations: {}
 ##
 podAnnotations: {}
 
+## Security Context to set on pod level
+##
+podSecurityContext:
+  runAsNonRoot: true
+
+## Security Context to set on container level
+##
+containerSecurityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
 ## Annotations to be added to the Rollout service
 ##
 serviceAnnotations: {}

From 8f523cbed09ac95ee230a858425d22d1898881a5 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Mon, 31 May 2021 18:09:33 +0200
Subject: [PATCH 2/5] chore(argo-events): Use container images from quay.io
 (#771)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>
---
 charts/argo-events/Chart.yaml  |  2 +-
 charts/argo-events/values.yaml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 4731f882..6a7b1b7e 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 1.6.0
+version: 1.6.1
 keywords:
   - argo-events
   - sensor-controller
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index df7d4a1a..55dd6643 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -1,5 +1,5 @@
 # docker registry
-registry: argoproj
+registry: quay.io
 
 # The image pull policy
 imagePullPolicy: Always
@@ -47,10 +47,10 @@ singleNamespace: true
 # sensor controller
 sensorController:
   name: sensor-controller
-  image: sensor-controller
+  image: argoproj/sensor-controller
   tag: v1.3.1
   replicaCount: 1
-  sensorImage: sensor
+  sensorImage: argoproj/sensor
   podAnnotations: {}
   nodeSelector: {}
   podLabels: {}
@@ -61,10 +61,10 @@ sensorController:
 
 eventsourceController:
   name: eventsource-controller
-  image: eventsource-controller
+  image: argoproj/eventsource-controller
   tag: v1.3.1
   replicaCount: 1
-  eventsourceImage: eventsource
+  eventsourceImage: argoproj/eventsource
   podAnnotations: {}
   nodeSelector: {}
   podLabels: {}
@@ -75,7 +75,7 @@ eventsourceController:
 
 eventbusController:
   name: eventbus-controller
-  image: eventbus-controller
+  image: argoproj/eventbus-controller
   tag: v1.3.1
   replicaCount: 1
   podAnnotations: {}

From 8ff9fe551b22b0315b80afca8aea64832ea20c2c Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Mon, 31 May 2021 18:10:30 +0200
Subject: [PATCH 3/5] chore: Remove old workflow in '.argo' directory (#770)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>
---
 .argo/argo-checkout.yaml | 21 ---------------
 .argo/publish.yaml       | 58 ----------------------------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 .argo/argo-checkout.yaml
 delete mode 100644 .argo/publish.yaml

diff --git a/.argo/argo-checkout.yaml b/.argo/argo-checkout.yaml
deleted file mode 100644
index d7280c3b..00000000
--- a/.argo/argo-checkout.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-type: container
-version: 1
-name: argo-checkout
-description: Checks out a source repository to /src
-resources:
-  mem_mib: 500
-  cpu_cores: 0.1
-image: argoproj/argoscm:v2.0
-command: ["axscm"]
-args: ["clone", "%%inputs.parameters.REPO%%", "/src", "--commit", "%%inputs.parameters.COMMIT%%"]
-inputs:
-  parameters:
-    COMMIT:
-      default: "%%session.commit%%"
-    REPO:
-      default: "%%session.repo%%"
-outputs:
-  artifacts:
-    CODE:
-      path: /src
diff --git a/.argo/publish.yaml b/.argo/publish.yaml
deleted file mode 100644
index 7f15760c..00000000
--- a/.argo/publish.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-type: workflow
-version: 1
-name: Publish Charts
-inputs:
-  parameters:
-    COMMIT:
-      default: "%%session.commit%%"
-    REPO:
-      default: "%%session.repo%%"
-steps:
-- CHECKOUT:
-    template: argo-checkout
-- PREPARE:
-    image: hypnoglow/kubernetes-helm:v2.6.1
-    resources:
-      mem_mib: 500
-      cpu_cores: 0.1
-    command: ["sh", "-c"]
-    args: [cd /src && helm init --client-only && ./scripts/publish.sh]
-    inputs:
-      artifacts:
-        CODE:
-          from: "%%steps.CHECKOUT.outputs.artifacts.CODE%%"
-          path: /src
-    outputs:
-      artifacts:
-        CODE:
-          path: /src/output
-- PUBLISH:
-    image: argoproj/argoscm:v2.0
-    command: ["sh", "-c"]
-    args: [
-      axscm clone %%inputs.parameters.REPO%% --commit gh-pages /src && cd /src && cp -r /output/* . &&
-      git add . && git commit -m "Build on `date`" &&
-      axscm clone %%inputs.parameters.REPO%% /src --commit gh-pages --merge=gh-pages --push]
-    resources:
-      mem_mib: 500
-      cpu_cores: 0.1
-    inputs:
-      artifacts:
-        CODE:
-          from: "%%steps.PREPARE.outputs.artifacts.CODE%%"
-          path: /output
-
----
-type: policy
-version: 1
-name: Publish Charts Policy
-template: Publish Charts
-notifications:
-- when:
-  - on_failure
-  whom:
-  - committer
-  - author
-when:
-- event: on_push

From b3b6a38c861d497baa618cdac123c4404d01984b Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Mon, 31 May 2021 18:18:09 +0200
Subject: [PATCH 4/5] feat(argo-workflows): Add support for fullnameOverride
 (#769)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>
---
 charts/argo-workflows/Chart.yaml             | 2 +-
 charts/argo-workflows/templates/_helpers.tpl | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index 094fc999..a3c8442a 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.1.5
+version: 0.2.0
 appVersion: "v3.0.2"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
diff --git a/charts/argo-workflows/templates/_helpers.tpl b/charts/argo-workflows/templates/_helpers.tpl
index 00173131..a72c148f 100644
--- a/charts/argo-workflows/templates/_helpers.tpl
+++ b/charts/argo-workflows/templates/_helpers.tpl
@@ -26,9 +26,17 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "argo-workflows.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
+{{- end -}}
 
 {{/*
 Create chart name and version as used by the chart label.

From f2e530ea7ea93620fa304970a0fe93549323a9e2 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Mon, 31 May 2021 18:31:44 +0200
Subject: [PATCH 5/5] fix(argo-workflows): Fix indentation when using extraEnv
 (#773)

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-workflows/Chart.yaml              |  2 +-
 .../workflow-controller-deployment.yaml       |  2 +-
 .../templates/server/server-deployment.yaml   | 21 +++++++++++--------
 charts/argo-workflows/values.yaml             | 14 +++++++++++--
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index a3c8442a..e45ed5c5 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: "v3.0.2"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
diff --git a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
index c35894ec..9f80ea7f 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
@@ -70,7 +70,7 @@ spec:
                   apiVersion: v1
                   fieldPath: metadata.name
           {{- with .Values.controller.extraEnv }}
-            {{ toYaml . | nindent 10 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
           resources:
             {{- toYaml .Values.controller.resources | nindent 12 }}
diff --git a/charts/argo-workflows/templates/server/server-deployment.yaml b/charts/argo-workflows/templates/server/server-deployment.yaml
index 3a97a7fb..5effabf6 100644
--- a/charts/argo-workflows/templates/server/server-deployment.yaml
+++ b/charts/argo-workflows/templates/server/server-deployment.yaml
@@ -60,15 +60,18 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 20
           env:
-          - name: IN_CLUSTER
-            value: "true"
-          - name: ARGO_NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-          - name: BASE_HREF
-            value: {{ .Values.server.baseHref | quote }}
+            - name: IN_CLUSTER
+              value: "true"
+            - name: ARGO_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.namespace
+            - name: BASE_HREF
+              value: {{ .Values.server.baseHref | quote }}
+          {{- with .Values.server.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.server.resources | nindent 12 }}
           volumeMounts:
diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml
index 684fe6cb..b78666a7 100644
--- a/charts/argo-workflows/values.yaml
+++ b/charts/argo-workflows/values.yaml
@@ -120,9 +120,13 @@ controller:
   # service type `LoadBalancer`
   loadBalancerSourceRanges: []
   resources: {}
-  # The list of environment variable definitions to be added to the controller
-  # manages container verbatim.
+
+  ## Extra environment variables to provide to the controller container
+  ## extraEnv:
+  ##   - name: FOO
+  ##     value: "bar"
   extraEnv: []
+
   # Extra arguments to be added to the controller
   extraArgs: []
   replicas: 1
@@ -226,6 +230,12 @@ server:
   # https://argoproj.github.io/argo-workflows/tls/
   secure: false
 
+  ## Extra environment variables to provide to the argo-server container
+  ## extraEnv:
+  ##   - name: FOO
+  ##     value: "bar"
+  extraEnv: []
+
   # Extra arguments to provide to the Argo server binary.
   extraArgs: []