feat: Add Configmap lookup on install

Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>
2021-04-21 17:34:29 +02:00 · 2021-04-21 17:34:29 +02:00 · 9e1c523e3e
commit 9e1c523e3e
parent 1bd4e85b83
98 changed files with 3023 additions and 3039 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -1,9 +1,13 @@
+Note on DCO:
+
+If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the *Details* link next to the DCO action for instructions on how to resolve this.
+
 Checklist:

 * [ ] I have updated the chart version in `Chart.yaml` following Semantic Versioning.
 * [ ] Any new values are backwards compatible and/or have sensible default.
 * [ ] I have followed the testing instructions in the [contributing guide](https://github.com/argoproj/argo-helm/blob/master/CONTRIBUTING.md).
-* [ ] I have signed the CLA and the build is green.
-* [ ] I will test my changes again once merged to master and published.
+* [ ] I have signed off all my commits as required by [DCO](https://github.com/argoproj/argoproj/tree/master/community#contributing-to-argo).
+* [ ] My build is green ([troubleshooting builds](https://argoproj.github.io/argo-cd/developer-guide/ci/)).

 Changes are automatically published when merged to `master`. They are not published on branches.
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
--- a/10
+++ b/10
@ -1,16 +1,16 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners

 # Argo Workflows
-/charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand
+/charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler

 # Argo CD
-/charts/argo-cd @seanson @spencergilbert @davidkarlsen @mr-sour @yann-soubeyrand
+/charts/argo-cd @seanson @spencergilbert @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler

 # Argo Events
-/charts/argo-events @jbehling @VaibhavPage
+/charts/argo-events @jbehling @VaibhavPage @oliverbaehler

 # Argo Rollouts
-/charts/argo-rollouts @cabrinha
+/charts/argo-rollouts @cabrinha @oliverbaehler

 # Argo CD Notifications
-/charts/argocd-notifications @alexmt @andyfeller
+/charts/argocd-notifications @alexmt @andyfeller @oliverbaehler
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Argo Helm Charts

-Argo Helm is a collection of **community maintained** charts for http://argoproj.io/ projects. the charts can be added using following command:
+Argo Helm is a collection of **community maintained** charts for http://argoproj.io/ projects. The charts can be added using following command:

 ```
 helm repo add argo https://argoproj.github.io/argo-helm
--- a/charts/argo-cd/.helmignore
+++ b/charts/argo-cd/.helmignore
@ -1,2 +1,2 @@
-*.tgz
+/*.tgz
 output
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@ -1,8 +1,15 @@
 apiVersion: v2
+<<<<<<< HEAD
 appVersion: 1.8.4
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
 version: 3.0.0
+=======
+appVersion: 2.0.0
+description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
+name: argo-cd
+version: 3.1.2
+>>>>>>> 5955a3bef8409a3edb19a59f6eda32023b255b2c
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
@ -16,6 +23,10 @@ maintainers:
  - name: seanson
 dependencies:
  - name: redis-ha
+<<<<<<< HEAD
    version: 4.10.1
+=======
+    version: 4.10.4
+>>>>>>> 5955a3bef8409a3edb19a59f6eda32023b255b2c
    repository: https://dandydeveloper.github.io/charts/
    condition: redis-ha.enabled
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@ -14,6 +14,10 @@ This chart currently installs the non-HA version of ArgoCD.

 ## Upgrading

+### 3.0.0 and above
+
+Helm apiVersion switched to `v2`. Requires Helm `3.0.0` or above to install. [Read More](https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/) on how to migrate your release from Helm 2 to Helm 3.
+
 ### 2.14.7 and above

 The `matchLabels` key in the ArgoCD Appliaction Controller is no longer hard-coded. Note that labels are immutable so caution should be exercised when making changes to this resource.
@ -76,6 +80,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` |
 | nameOverride | Provide a name in place of `argocd` | `"argocd"` |
 | installCRDs | Install CRDs if you are using Helm2. | `true` |
+| configs.clusterCredentials | Provide one or multiple [external cluster credentials](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#clusters) | `[]` (See [values.yaml](values.yaml)) |
 | configs.knownHostsAnnotations | Known Hosts configmap annotations | `{}` |
 | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) |
 | configs.secret.annotations | Annotations for argocd-secret | `{}` |
@ -97,6 +102,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | controller.affinity | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) | `{}` |
 | controller.args.operationProcessors | define the controller `--operation-processors` | `"10"` |
 | controller.args.appResyncPeriod | define the controller `--app-resync` | `"180"` |
+| controller.args.selfHealTimeout | define the controller `--self-heal-timeout-seconds` | `"5"` |
 | controller.args.statusProcessors | define the controller `--status-processors` | `"20"` |
 | controller.clusterAdminAccess.enabled | Enable RBAC for local cluster deployments. | `true` |
 | controller.containerPort | Controller listening port. | `8082` |
@ -134,6 +140,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | controller.service.labels | Controller service labels. | `{}` |
 | controller.service.port | Controller service port. | `8082` |
 | controller.serviceAccount.annotations | Controller service account annotations | `{}` |
+| controller.serviceAccount.automountServiceAccountToken | Automount API credentials for the Service Account | `true` |
 | controller.serviceAccount.create | Create a service account for the controller | `true` |
 | controller.serviceAccount.name | Service account name. | `"argocd-application-controller"` |
 | controller.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
@ -181,6 +188,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | repoServer.replicas | The number of repo server pods to run | `1` |
 | repoServer.resources | Resource limits and requests for the repo server pods. | `{}` |
 | repoServer.service.annotations | Repo server service annotations. | `{}` |
+| repoServer.service.automountServiceAccountToken | Automount API credentials for the Service Account | `true` |
 | repoServer.service.labels | Repo server service labels. | `{}` |
 | repoServer.service.port | Repo server service port. | `8081` |
 | repoServer.serviceAccount.annotations | Repo server service account annotations | `{}` |
@ -267,6 +275,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.service.externalIPs | Server service external IPs. | `[]` |
 | server.service.type | Server service type | `"ClusterIP"` |
 | server.serviceAccount.annotations | Server service account annotations | `{}` |
+| server.serviceAccount.automountServiceAccountToken | Automount API credentials for the Service Account | `true` |
 | server.serviceAccount.create | Create server service account | `true` |
 | server.serviceAccount.name | Server service account name | `"argocd-server"` |
 | server.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
@ -299,6 +308,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | dex.podLabels | Labels for the Dex server pods | `{}` |
 | dex.priorityClassName | Priority class for dex | `""` |
 | dex.resources | Resource limits and requests for dex | `{}` |
+| dex.serviceAccount.automountServiceAccountToken | Automount API credentials for the Service Account | `true` |
 | dex.serviceAccount.create | Create dex service account | `true` |
 | dex.serviceAccount.name | Dex service account name | `"argocd-dex-server"` |
 | dex.servicePortGrpc | Server GRPC port | `5557` |
@ -333,7 +343,7 @@ through `xxx.extraArgs`
 | redis.securityContext | Redis Pod Security Context | See [values.yaml](values.yaml) |
 | redis.servicePort | Redis service port | `6379` |
 | redis.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
-| redis-ha | Configures [Redis HA subchart](https://github.com/helm/charts/tree/master/stable/redis-ha) The properties below have been changed from the subchart defaults | |
+| redis-ha | Configures [Redis HA subchart](https://github.com/DandyDeveloper/charts/tree/master/charts/redis-ha) The properties below have been changed from the subchart defaults | |
 | redis-ha.enabled | Enables the Redis HA subchart and disables the custom Redis single node deployment| `false` |
 | redis-ha.exporter.enabled | If `true`, the prometheus exporter sidecar is enabled | `true` |
 | redis-ha.persistentVolume.enabled | Configures persistency on Redis nodes | `false`
--- a/charts/argo-cd/crds/crd-project.yaml
+++ b/charts/argo-cd/crds/crd-project.yaml
@ -228,23 +228,28 @@ spec:
            description: Status of the AppProject
            properties:
              jwtTokensByRole:
+                description: JWT Tokens issued for each of the roles in the project
                additionalProperties:
-                  description: List of JWTToken objects for a given role
+                  properties:
+                    items: 
+                      description: List of JWT Tokens issued for the role
                      items: 
                        description: Holds the issuedAt and expiresAt values of the token
                        properties:
                          exp:
                            description: The expiresAt value of a token
-                        type: string
+                            format: int64
+                            type: integer
                          iat:
                            description: The issuedAt value of a token
-                        type: string
+                            format: int64
+                            type: integer
                          id:
                            description: ID of the token
                            type: string
                        type: object
                      type: array
-                description: JWT Tokens issued for each of the roles in the project
+                  type: object
                type: object
            type: object
        required:
--- a/charts/argo-cd/templates/_helpers.tpl
+++ b/charts/argo-cd/templates/_helpers.tpl
@ -116,3 +116,26 @@ Create chart name and version as used by the chart label.
 {{- define "argo-cd.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "argo-cd.labels" -}}
+helm.sh/chart: {{ include "argo-cd.chart" .context }}
+{{ include "argo-cd.selectorLabels" (dict "context" .context "component" .component "name" .name) }}
+app.kubernetes.io/managed-by: {{ .context.Release.Service }}
+app.kubernetes.io/part-of: argocd
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "argo-cd.selectorLabels" -}}
+{{- if .name -}}
+app.kubernetes.io/name: {{ include "argo-cd.name" .context }}-{{ .name }}
+{{ end -}}
+app.kubernetes.io/instance: {{ .context.Release.Name }}
+{{- if .component }}
+app.kubernetes.io/component: {{ .component }}
+{{- end }}
+{{- end }}
--- a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml
@ -4,12 +4,7 @@ kind: ClusterRole
 metadata:
  name: {{ template "argo-cd.controller.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
 rules:
 - apiGroups:
  - '*'
--- a/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml
@ -4,12 +4,7 @@ kind: ClusterRoleBinding
 metadata:
  name: {{ template "argo-cd.controller.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@ -4,18 +4,12 @@ kind: {{ .Values.controller.enableStatefulSet | ternary "StatefulSet" "Deploymen
 metadata:
  name: {{ template "argo-cd.controller.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
    app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.controller.image.tag | quote }}
 spec:
  selector:
    matchLabels:
-      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.controller.name) | nindent 6 }}
  {{- if  .Values.controller.enableStatefulSet }}
  serviceName: {{ template "argo-cd.controller.fullname" . }}
  {{- end }}
@ -30,12 +24,7 @@ spec:
      {{- end }}
      {{- end }}
      labels:
-        app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-        helm.sh/chart: {{ include "argo-cd.chart" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app.kubernetes.io/managed-by: {{ .Release.Service }}
-        app.kubernetes.io/part-of: argocd
-        app.kubernetes.io/component: {{ .Values.controller.name }}
+        {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 8 }}
        app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.controller.image.tag | quote }}
        {{- if .Values.controller.podLabels }}
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
@ -57,6 +46,8 @@ spec:
        - {{ .Values.controller.args.operationProcessors | quote }}
        - --app-resync
        - {{ .Values.controller.args.appResyncPeriod | quote }}
+        - --self-heal-timeout-seconds
+        - {{ .Values.controller.args.selfHealTimeout | quote }}
        - --repo-server
        - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
        - --logformat
--- a/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml
@ -9,12 +9,7 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" "metrics") | nindent 4 }}
 {{- if .Values.controller.metrics.service.labels }}
 {{- toYaml .Values.controller.metrics.service.labels | nindent 4 }}
 {{- end }}
@ -26,6 +21,5 @@ spec:
    port: {{ .Values.controller.metrics.service.servicePort }}
    targetPort: controller
  selector:
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
+    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.controller.name) | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/argocd-application-controller/prometheusrule.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/prometheusrule.yaml
@ -7,12 +7,7 @@ metadata:
  namespace: {{ .Values.controller.metrics.rules.namespace }}
  {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
    {{- if .Values.controller.metrics.rules.selector }}
 {{- toYaml .Values.controller.metrics.rules.selector | nindent 4 }}
    {{- end }}
--- a/charts/argo-cd/templates/argocd-application-controller/role.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/role.yaml
@ -3,12 +3,7 @@ kind: Role
 metadata:
  name: {{ template "argo-cd.controller.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
 rules:
 - apiGroups:
  - ""
--- a/charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml
@ -3,12 +3,7 @@ kind: RoleBinding
 metadata:
  name: {{ template "argo-cd.controller.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
--- a/charts/argo-cd/templates/argocd-application-controller/service.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/service.yaml
@ -9,17 +9,11 @@ metadata:
 {{- end }}
  name: {{ template "argo-cd.controller.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
 spec:
  ports:
  - name: {{ .Values.controller.service.portName }}
    port: {{ .Values.controller.service.port }}
    targetPort: {{ .Values.controller.containerPort }}
  selector:
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
+    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.controller.name) | nindent 4 }}
--- a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml
@ -1,6 +1,7 @@
 {{- if .Values.controller.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
+automountServiceAccountToken: {{ .Values.controller.serviceAccount.automountServiceAccountToken }}
 metadata:
  name: {{ template "argo-cd.controllerServiceAccountName" . }}
 {{- if .Values.controller.serviceAccount.annotations }}
@ -10,10 +11,5 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
@ -7,12 +7,7 @@ metadata:
  namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
  {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
    {{- if .Values.controller.metrics.serviceMonitor.selector }}
 {{- toYaml .Values.controller.metrics.serviceMonitor.selector | nindent 4 }}
    {{- end }}
@ -29,7 +24,6 @@ spec:
      - {{ .Release.Namespace }}
  selector:
    matchLabels:
-      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics
-      app.kubernetes.io/component: {{ .Values.controller.name }}
+      {{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.controller.name "name" "metrics") | nindent 6 }}
 {{- end }}

--- a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml
@ -1,14 +1,10 @@
+{{- if .Values.server.configEnabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
  name: argocd-cm
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-cm
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "cm") | nindent 4 }}
  {{- if .Values.server.configAnnotations }}
  annotations:
  {{- range $key, $value := .Values.server.configAnnotations }}
@ -17,3 +13,4 @@ metadata:
  {{- end }}
 data:
 {{- toYaml .Values.server.config | nindent 4 }}
+{{- end }}
--- a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml
@ -4,12 +4,7 @@ kind: ConfigMap
 metadata:
  name: argocd-rbac-cm
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-rbac-cm
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "rbac-cm") | nindent 4 }}
  {{- if .Values.server.rbacConfigAnnotations }}
  annotations:
  {{- range $key, $value := .Values.server.rbacConfigAnnotations }}
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@ -4,12 +4,7 @@ kind: Secret
 metadata:
  name: argocd-secret
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-secret
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "secret") | nindent 4 }}
  {{- if .Values.configs.secret.annotations }}
  annotations:
  {{- range $key, $value := .Values.configs.secret.annotations }}
--- a/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml
@ -3,12 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-ssh-known-hosts-cm
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "ssh-known-hosts-cm") | nindent 4 }}
  {{- if .Values.configs.knownHostsAnnotations }}
  annotations:
  {{- range $key, $value := .Values.configs.knownHostsAnnotations }}
--- a/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml
@ -5,12 +5,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-tls-certs-cm
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "tls-certs-cm") | nindent 4 }}
  {{- if .Values.configs.tlsCertsAnnotations }}
  annotations:
  {{- range $key, $value := .Values.configs.tlsCertsAnnotations }}
--- a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml
+++ b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml
@ -0,0 +1,23 @@
+{{- range .Values.configs.clusterCredentials }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "argo-cd.name" $ }}-cluster-{{ .name }}
+  labels:
+    {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
+    argocd.argoproj.io/secret-type: cluster
+  {{- with .annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+type: Opaque
+stringData:
+  name: {{ required "A valid .Values.configs.clusterCredentials[].name entry is required!" .name }}
+  server: {{ required "A valid .Values.configs.clusterCredentials[].server entry is required!" .server }}
+  {{- with .namespaces }}
+  namespaces: {{ . }}
+  {{- end }}
+  config: |
+    {{- required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toPrettyJson | nindent 4 }}
+{{- end }}
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@ -4,18 +4,12 @@ kind: Deployment
 metadata:
  name: {{ template "argo-cd.repoServer.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.repoServer.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
    app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.repoServer.image.tag | quote }}
 spec:
  selector:
    matchLabels:
-      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.repoServer.name) | nindent 6 }}
  revisionHistoryLimit: 5
  {{- if (ne .Values.repoServer.autoscaling.enabled true) }}
  replicas: {{ .Values.repoServer.replicas }}
@ -29,12 +23,7 @@ spec:
      {{- end }}
      {{- end }}
      labels:
-        app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
-        helm.sh/chart: {{ include "argo-cd.chart" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app.kubernetes.io/managed-by: {{ .Release.Service }}
-        app.kubernetes.io/part-of: argocd
-        app.kubernetes.io/component: {{ .Values.repoServer.name }}
+        {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 8 }}
        app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.repoServer.image.tag | quote }}
        {{- if .Values.repoServer.podLabels }}
 {{- toYaml .Values.repoServer.podLabels | nindent 8 }}
@ -82,10 +71,8 @@ spec:
        {{- if .Values.repoServer.volumeMounts }}
 {{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
        {{- end }}
-        {{- if .Values.openshift.enabled }}
        - mountPath: /app/config/gpg/keys
          name: gpg-keyring
-        {{- end }}
        {{- if .Values.configs.knownHosts }}
        - mountPath: /app/config/ssh
          name: ssh-known-hosts
@ -94,6 +81,8 @@ spec:
        - mountPath: /app/config/tls
          name: tls-certs
        {{- end }}
+        - mountPath: /tmp
+          name: tmp-dir
        ports:
        - name: repo-server
          containerPort: {{ .Values.repoServer.containerPort }}
@ -142,10 +131,8 @@ spec:
      {{- if .Values.repoServer.volumes }}
 {{- toYaml .Values.repoServer.volumes | nindent 6}}
      {{- end }}
-      {{- if .Values.openshift.enabled }}
      - emptyDir: {}
        name: gpg-keyring
-      {{- end }}
      {{- if .Values.configs.knownHosts }}
      - configMap:
          name: argocd-ssh-known-hosts-cm
@ -156,6 +143,8 @@ spec:
          name: argocd-tls-certs-cm
        name: tls-certs
      {{- end }}
+      - emptyDir: {}
+        name: tmp-dir
      {{- if .Values.repoServer.initContainers }}
      initContainers:
 {{- toYaml .Values.repoServer.initContainers | nindent 6 }}
--- a/charts/argo-cd/templates/argocd-repo-server/hpa.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/hpa.yaml
@ -3,12 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}-hpa
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.repoServer.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" (printf "%s-hpa" .Values.repoServer.name)) | nindent 4 }}
  name: {{ template "argo-cd.repoServer.fullname" . }}-hpa
 spec:
  scaleTargetRef:
--- a/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml
@ -9,12 +9,7 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    app.kubernetes.io/name: {{ template "argo-cd.repoServer.fullname" . }}-metrics
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.repoServer.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" (printf "%s-metrics" .Values.repoServer.name)) | nindent 4 }}
 {{- if .Values.repoServer.metrics.service.labels }}
 {{- toYaml .Values.repoServer.metrics.service.labels | nindent 4 }}
 {{- end }}
@ -26,6 +21,5 @@ spec:
    port: {{ .Values.repoServer.metrics.service.servicePort }}
    targetPort: metrics
  selector:
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
+    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.repoServer.name) | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/argocd-repo-server/repository-credentials-secret.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/repository-credentials-secret.yaml
@ -4,12 +4,7 @@ kind: Secret
 metadata:
  name: argocd-repository-credentials
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-secret
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "secret") | nindent 4 }}
 type: Opaque
 data:
 {{- range $key, $value := .Values.configs.repositoryCredentials }}
--- a/charts/argo-cd/templates/argocd-repo-server/role.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/role.yaml
@ -4,12 +4,7 @@ kind: Role
 metadata:
  name: {{ template "argo-cd.repoServer.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.repoServer.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
 rules:
 {{- if .Values.repoServer.rbac }}
 {{toYaml .Values.repoServer.rbac }}
--- a/charts/argo-cd/templates/argocd-repo-server/rolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/rolebinding.yaml
@ -4,12 +4,7 @@ kind: RoleBinding
 metadata:
  name: {{ template "argo-cd.repoServer.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.repoServer.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
--- a/charts/argo-cd/templates/argocd-repo-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/service.yaml
@ -8,12 +8,7 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.repoServer.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
  name: {{ template "argo-cd.repoServer.fullname" . }}
 spec:
  ports:
@ -22,5 +17,4 @@ spec:
    port: {{ .Values.repoServer.service.port }}
    targetPort: repo-server
  selector:
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
+    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.repoServer.name) | nindent 4 }}
--- a/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml
@ -1,6 +1,7 @@
 {{- if .Values.repoServer.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
+automountServiceAccountToken: {{ .Values.repoServer.serviceAccount.automountServiceAccountToken }}
 metadata:
  name: {{ template "argo-cd.repoServerServiceAccountName" . }}
 {{- if .Values.repoServer.serviceAccount.annotations }}
@ -10,10 +11,5 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.repoServer.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
@ -7,12 +7,7 @@ metadata:
  namespace: {{ .Values.repoServer.metrics.serviceMonitor.namespace }}
  {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.repoServer.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
    {{- if .Values.repoServer.metrics.serviceMonitor.selector }}
 {{- toYaml .Values.repoServer.metrics.serviceMonitor.selector | nindent 4 }}
    {{- end }}
@ -29,8 +24,6 @@ spec:
      - {{ .Release.Namespace }}
  selector:
    matchLabels:
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/name: {{ template "argo-cd.repoServer.fullname" . }}-metrics
-      app.kubernetes.io/component: {{ .Values.repoServer.name }}
+      {{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.repoServer.name "name" (printf "%s-metrics" .Values.repoServer.name)) | nindent 6 }}
 {{- end }}

--- a/charts/argo-cd/templates/argocd-server/backendconfig.yaml
+++ b/charts/argo-cd/templates/argocd-server/backendconfig.yaml
@ -4,12 +4,7 @@ kind: BackendConfig
 metadata:
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 spec:
  {{- toYaml .Values.server.GKEbackendConfig.spec | nindent 2 }}
 {{- end }}
--- a/charts/argo-cd/templates/argocd-server/certificate.yaml
+++ b/charts/argo-cd/templates/argocd-server/certificate.yaml
@ -12,12 +12,7 @@ kind: Certificate
 metadata:
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 spec:
  commonName: {{ .Values.server.certificate.domain | quote }}
  dnsNames:
--- a/charts/argo-cd/templates/argocd-server/clusterrole.yaml
+++ b/charts/argo-cd/templates/argocd-server/clusterrole.yaml
@ -4,12 +4,7 @@ kind: ClusterRole
 metadata:
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 rules:
  - apiGroups:
      - '*'
--- a/charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml
@ -4,12 +4,7 @@ kind: ClusterRoleBinding
 metadata:
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@ -4,18 +4,12 @@ kind: Deployment
 metadata:
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
    app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.server.image.tag | quote }}
 spec:
  selector:
    matchLabels:
-      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 6 }}
  revisionHistoryLimit: 5
  {{- if (ne .Values.server.autoscaling.enabled true) }}
  replicas: {{ .Values.server.replicas }}
@ -29,12 +23,7 @@ spec:
      {{- end }}
      {{- end }}
      labels:
-        app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-        helm.sh/chart: {{ include "argo-cd.chart" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app.kubernetes.io/managed-by: {{ .Release.Service }}
-        app.kubernetes.io/part-of: argocd
-        app.kubernetes.io/component: {{ .Values.server.name }}
+        {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 8 }}
        app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.server.image.tag | quote }}
        {{- if .Values.server.podLabels }}
 {{- toYaml .Values.server.podLabels | nindent 8 }}
--- a/charts/argo-cd/templates/argocd-server/hpa.yaml
+++ b/charts/argo-cd/templates/argocd-server/hpa.yaml
@ -3,12 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-hpa
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" (printf "%s-hpa" .Values.server.name)) | nindent 4 }}
  name: {{ template "argo-cd.server.fullname" . }}-hpa
 spec:
  scaleTargetRef:
--- a/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
@ -18,12 +18,7 @@ metadata:
 {{- end }}
  name: {{ template "argo-cd.server.fullname" . }}-grpc
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 {{- if .Values.server.ingressGrpc.labels }}
 {{- toYaml .Values.server.ingressGrpc.labels | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@ -18,12 +18,7 @@ metadata:
 {{- end }}
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 {{- if .Values.server.ingress.labels }}
 {{- toYaml .Values.server.ingress.labels | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/argocd-server/metrics-service.yaml
+++ b/charts/argo-cd/templates/argocd-server/metrics-service.yaml
@ -9,12 +9,7 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-metrics
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" (printf "%s-metrics" .Values.server.name)) | nindent 4 }}
 {{- if .Values.server.metrics.service.labels }}
 {{- toYaml .Values.server.metrics.service.labels | nindent 4 }}
 {{- end }}
@ -26,6 +21,5 @@ spec:
    port: {{ .Values.server.metrics.service.servicePort }}
    targetPort: metrics
  selector:
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
+    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/argocd-server/role.yaml
+++ b/charts/argo-cd/templates/argocd-server/role.yaml
@ -3,12 +3,7 @@ kind: Role
 metadata:
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 rules:
 - apiGroups:
  - ""
--- a/charts/argo-cd/templates/argocd-server/rolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-server/rolebinding.yaml
@ -3,12 +3,7 @@ kind: RoleBinding
 metadata:
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
--- a/charts/argo-cd/templates/argocd-server/route.yaml
+++ b/charts/argo-cd/templates/argocd-server/route.yaml
@ -4,12 +4,7 @@ kind: Route
 metadata:
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 {{- with .Values.server.route.annotations }}
  annotations:
 {{ toYaml . | indent 4 }}
--- a/charts/argo-cd/templates/argocd-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-server/service.yaml
@ -9,12 +9,7 @@ metadata:
 {{- end }}
  name: {{ template "argo-cd.server.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 {{- if .Values.server.service.labels }}
 {{- toYaml .Values.server.service.labels | nindent 4 }}
 {{- end }}
@ -36,8 +31,7 @@ spec:
    nodePort: {{ .Values.server.service.nodePortHttps }}
    {{- end }}
  selector:
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
+    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 4 }}
 {{- if eq .Values.server.service.type "LoadBalancer" }}
 {{- if .Values.server.service.loadBalancerIP }}
  loadBalancerIP: {{ .Values.server.service.loadBalancerIP | quote }}
--- a/charts/argo-cd/templates/argocd-server/serviceaccount.yaml
+++ b/charts/argo-cd/templates/argocd-server/serviceaccount.yaml
@ -1,6 +1,7 @@
 {{- if .Values.server.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
+automountServiceAccountToken: {{ .Values.server.serviceAccount.automountServiceAccountToken }}
 metadata:
  name: {{ template "argo-cd.serverServiceAccountName" . }}
 {{- if .Values.server.serviceAccount.annotations }}
@ -10,10 +11,5 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
@ -7,12 +7,7 @@ metadata:
  namespace: {{ .Values.server.metrics.serviceMonitor.namespace }}
  {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
    {{- if .Values.server.metrics.serviceMonitor.selector }}
 {{- toYaml .Values.server.metrics.serviceMonitor.selector | nindent 4 }}
    {{- end }}
@ -29,8 +24,6 @@ spec:
      - {{ .Release.Namespace }}
  selector:
    matchLabels:
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-metrics
-      app.kubernetes.io/component: {{ .Values.server.name }}
+      {{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.server.name "name" (printf "%s-metrics" .Values.server.name)) | nindent 6 }}
 {{- end }}

--- a/charts/argo-cd/templates/dex/deployment.yaml
+++ b/charts/argo-cd/templates/dex/deployment.yaml
@ -4,18 +4,12 @@ kind: Deployment
 metadata:
  name: {{ template "argo-cd.dex.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.dex.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 4 }}
    app.kubernetes.io/version: {{ .Values.dex.image.tag | quote }}
 spec:
  selector:
    matchLabels:
-      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.dex.name) | nindent 6 }}
  template:
    metadata:
      {{- if .Values.dex.podAnnotations }}
@ -25,12 +19,7 @@ spec:
      {{- end }}
      {{- end }}
      labels:
-        app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-        helm.sh/chart: {{ include "argo-cd.chart" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app.kubernetes.io/managed-by: {{ .Release.Service }}
-        app.kubernetes.io/part-of: argocd
-        app.kubernetes.io/component: {{ .Values.dex.name }}
+        {{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 8 }}
        app.kubernetes.io/version: {{ .Values.dex.image.tag | quote }}
        {{- if .Values.dex.podLabels }}
 {{- toYaml .Values.dex.podLabels | nindent 8 }}
@ -55,8 +44,8 @@ spec:
        command:
        - cp
        - -n
-        - /usr/local/bin/argocd-util
-        - /shared
+        - /usr/local/bin/argocd
+        - /shared/argocd-dex
        volumeMounts:
        - mountPath: /shared
          name: static-files
@ -65,7 +54,7 @@ spec:
        image: {{ .Values.dex.image.repository }}:{{ .Values.dex.image.tag }}
        imagePullPolicy: {{ .Values.dex.image.imagePullPolicy }}
        command:
-        - /shared/argocd-util
+        - /shared/argocd-dex
        - rundex
        {{- if .Values.dex.containerSecurityContext }}
        securityContext: {{- toYaml .Values.dex.containerSecurityContext | nindent 10 }}
@ -86,9 +75,11 @@ spec:
          containerPort: {{ .Values.dex.containerPortMetrics }}
          protocol: TCP
        {{- end }}
-{{- if .Values.dex.volumeMounts }}
        volumeMounts:
-{{- toYaml .Values.dex.volumeMounts | nindent 10 }}
+        - mountPath: /tmp
+          name: tmp-dir
+        {{- if .Values.dex.volumeMounts }}
+        {{- toYaml .Values.dex.volumeMounts | nindent 8 }}
        {{- end }}
        resources:
 {{- toYaml .Values.dex.resources | nindent 10 }}
@ -105,9 +96,11 @@ spec:
 {{- toYaml .Values.dex.affinity | nindent 8 }}
    {{- end }}
      serviceAccountName: {{ template "argo-cd.dexServiceAccountName" . }}
-{{- if .Values.dex.volumes }}
      volumes:
-{{- toYaml .Values.dex.volumes | nindent 8}}
+      - emptyDir: {}
+        name: tmp-dir
+      {{- if .Values.dex.volumes }}
+      {{- toYaml .Values.dex.volumes | nindent 6 }}
      {{- end }}
 {{- if .Values.dex.priorityClassName }}
      priorityClassName: {{ .Values.dex.priorityClassName }}
--- a/charts/argo-cd/templates/dex/role.yaml
+++ b/charts/argo-cd/templates/dex/role.yaml
@ -4,12 +4,7 @@ kind: Role
 metadata:
  name: {{ template "argo-cd.dex.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.dex.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 4 }}
 rules:
 - apiGroups:
  - ""
--- a/charts/argo-cd/templates/dex/rolebinding.yaml
+++ b/charts/argo-cd/templates/dex/rolebinding.yaml
@ -4,12 +4,7 @@ kind: RoleBinding
 metadata:
  name: {{ template "argo-cd.dex.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.dex.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 4 }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
--- a/charts/argo-cd/templates/dex/service.yaml
+++ b/charts/argo-cd/templates/dex/service.yaml
@ -10,12 +10,7 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.dex.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 4 }}
 {{- if .Values.dex.metrics.service.labels }}
 {{- toYaml .Values.dex.metrics.service.labels | nindent 4 }}
 {{- end }}
@ -36,6 +31,5 @@ spec:
    targetPort: metrics
 {{- end }}
  selector:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.dex.name) | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/dex/serviceaccount.yaml
+++ b/charts/argo-cd/templates/dex/serviceaccount.yaml
@ -1,6 +1,7 @@
-{{- if .Values.dex.serviceAccount.create }}
+{{- if and .Values.dex.enabled .Values.dex.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
+automountServiceAccountToken: {{ .Values.dex.serviceAccount.automountServiceAccountToken }}
 metadata:
  name: {{ template "argo-cd.dexServiceAccountName" . }}
 {{- if .Values.dex.serviceAccount.annotations }}
@ -10,10 +11,5 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.dex.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/templates/dex/servicemonitor.yaml
+++ b/charts/argo-cd/templates/dex/servicemonitor.yaml
@ -7,12 +7,7 @@ metadata:
  namespace: {{ .Values.dex.metrics.serviceMonitor.namespace }}
  {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.dex.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 4 }}
    {{- if .Values.dex.metrics.serviceMonitor.selector }}
 {{- toYaml .Values.dex.metrics.serviceMonitor.selector | nindent 4 }}
    {{- end }}
@ -29,7 +24,5 @@ spec:
      - {{ .Release.Namespace }}
  selector:
    matchLabels:
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
-      app.kubernetes.io/component: {{ .Values.dex.name }}
+      {{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 6 }}
 {{- end }}
--- a/charts/argo-cd/templates/redis/deployment.yaml
+++ b/charts/argo-cd/templates/redis/deployment.yaml
@ -5,12 +5,7 @@ kind: Deployment
 metadata:
  name: {{ template "argo-cd.redis.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.redis.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.redis.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 4 }}
    app.kubernetes.io/version: {{ .Values.redis.image.tag | quote }}
 spec:
  selector:
@ -25,12 +20,7 @@ spec:
      {{- end }}
      {{- end }}
      labels:
-        app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.redis.name }}
-        helm.sh/chart: {{ include "argo-cd.chart" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app.kubernetes.io/managed-by: {{ .Release.Service }}
-        app.kubernetes.io/part-of: argocd
-        app.kubernetes.io/component: {{ .Values.redis.name }}
+        {{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 8 }}
        app.kubernetes.io/version: {{ .Values.redis.image.tag | quote }}
        {{- if .Values.redis.podLabels }}
 {{- toYaml .Values.redis.podLabels | nindent 8 }}
--- a/charts/argo-cd/templates/redis/service.yaml
+++ b/charts/argo-cd/templates/redis/service.yaml
@ -5,16 +5,11 @@ kind: Service
 metadata:
  name: {{ template "argo-cd.redis.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.redis.name }}
-    helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.redis.name }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 4 }}
 spec:
  ports:
  - port: {{ .Values.redis.servicePort }}
    targetPort: {{ .Values.redis.servicePort }}
  selector:
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.redis.name }}
+    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.redis.name) | nindent 4 }}
 {{- end }}
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@ -10,7 +10,7 @@ installCRDs: true
 global:
  image:
    repository: argoproj/argocd
-    tag: v1.8.4
+    tag: v2.0.0
    imagePullPolicy: IfNotPresent
  securityContext: {}
  #  runAsUser: 999
@ -43,6 +43,7 @@ controller:
    statusProcessors: "20"
    operationProcessors: "10"
    appResyncPeriod: "180"
+    selfHealTimeout: "5"

  ## Argo controller log format: text|json
  logFormat: text
@ -74,6 +75,7 @@ controller:
    # capabilities:
    #   drop:
    #     - all
+    # readOnlyRootFilesystem: true

  ## Configures the controller port
  containerPort: 8082
@ -129,6 +131,8 @@ controller:
    name: argocd-application-controller
    ## Annotations applied to created service account
    annotations: {}
+    ## Automount API credentials for the Service Account
+    automountServiceAccountToken: true

  ## Server metrics controller configuration
  metrics:
@ -219,6 +223,8 @@ dex:
    name: argocd-dex-server
    ## Annotations applied to created service account
    annotations: {}
+    ## Automount API credentials for the Service Account
+    automountServiceAccountToken: true

  ## Additional volumeMounts to the controller main container.
  volumeMounts:
@ -253,6 +259,7 @@ dex:
    # capabilities:
    #   drop:
    #     - all
+    # readOnlyRootFilesystem: true

  resources: {}
  #  limits:
@ -302,6 +309,7 @@ redis:
    # capabilities:
    #   drop:
    #     - all
+    # readOnlyRootFilesystem: true

  ## Redis Pod specific security context
  securityContext:
@ -425,6 +433,7 @@ server:
    # capabilities:
    #   drop:
    #     - all
+    # readOnlyRootFilesystem: true

  resources: {}
  #  limits:
@ -477,6 +486,8 @@ server:
    name: argocd-server
    ## Annotations applied to created service account
    annotations: {}
+    ## Automount API credentials for the Service Account
+    automountServiceAccountToken: true

  ingress:
    enabled: false
@ -543,6 +554,7 @@ server:

  ## ArgoCD config
  ## reference https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/argocd-cm.yaml
+  configEnabled: true
  config:
    # Argo CD's externally facing base URL (optional). Required when configuring SSO
    url: https://argocd.example.com
@ -784,6 +796,7 @@ repoServer:
    # capabilities:
    #   drop:
    #     - all
+    # readOnlyRootFilesystem: true

  resources: {}
  #  limits:
@ -821,6 +834,8 @@ repoServer:
    #  name: argocd-repo-server
    ## Annotations applied to created service account
    annotations: {}
+    ## Automount API credentials for the Service Account
+    automountServiceAccountToken: true

  ## Repo server rbac rules
  # rbac:
@ -857,6 +872,29 @@ repoServer:

 ## Argo Configs
 configs:
+  ## External Cluster Credentials
+  ## reference:
+  ## - https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#clusters
+  ## - https://argoproj.github.io/argo-cd/operator-manual/security/#external-cluster-credentials
+  clusterCredentials: []
+    # - name: mycluster
+    #   server: https://mycluster.com
+    #   annotations: {}
+    #   config:
+    #     bearerToken: "<authentication token>"
+    #     tlsClientConfig:
+    #       insecure: false
+    #       caData: "<base64 encoded certificate>"
+    # - name: mycluster2
+    #   server: https://mycluster2.com
+    #   annotations: {}
+    #   namespaces: namespace1,namespace2
+    #   config:
+    #     bearerToken: "<authentication token>"
+    #     tlsClientConfig:
+    #       insecure: false
+    #       caData: "<base64 encoded certificate>"
+
  knownHostsAnnotations: {}
  knownHosts:
    data:
--- 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.2.3
+version: 1.3.1
 keywords:
  - argo-events
  - sensor-controller
--- a/charts/argo-events/crds/eventbus-crd.yml
+++ b/charts/argo-events/crds/eventbus-crd.yml
@ -1,3 +1,4 @@
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@ -16,3 +17,24 @@ spec:
    - name: v1alpha1
      served: true
      storage: true
+      schema:
+        openAPIV3Schema:
+          properties:
+            apiVersion:
+              type: string
+            kind:
+              type: string
+            metadata:
+              type: object
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+            status:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+          required:
+          - metadata
+          - spec
+          type: object
+      subresources:
+        status: {}
--- a/charts/argo-events/crds/eventsource-crd.yml
+++ b/charts/argo-events/crds/eventsource-crd.yml
@ -17,5 +17,24 @@ spec:
    - name: v1alpha1
      served: true
      storage: true
-
-
+      schema:
+        openAPIV3Schema:
+          properties:
+            apiVersion:
+              type: string
+            kind:
+              type: string
+            metadata:
+              type: object
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+            status:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+          required:
+          - metadata
+          - spec
+          type: object
+      subresources:
+        status: {}
--- a/charts/argo-events/crds/sensor-crd.yml
+++ b/charts/argo-events/crds/sensor-crd.yml
@ -17,4 +17,24 @@ spec:
    - name: v1alpha1
      served: true
      storage: true
-
+      schema:
+        openAPIV3Schema:
+          properties:
+            apiVersion:
+              type: string
+            kind:
+              type: string
+            metadata:
+              type: object
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+            status:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+          required:
+          - metadata
+          - spec
+          type: object
+      subresources:
+        status: {}
--- a/charts/argo-events/templates/argo-events-roles.yaml
+++ b/charts/argo-events/templates/argo-events-roles.yaml
@ -49,10 +49,13 @@ rules:
      - workflowtemplates/finalizers
      - sensors
      - sensors/finalizers
+      - sensors/status
      - eventsources
      - eventsources/finalizers
+      - eventsources/status
      - eventbus
      - eventbus/finalizers
+      - eventbus/status
  - apiGroups:
      - ""
    resources:
--- a/charts/argo-events/templates/eventbus-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml
@ -18,6 +18,9 @@ spec:
      labels:
        app: {{ .Release.Name }}-{{ .Values.eventbusController.name }}
        release: {{ .Release.Name }}
+      {{- with .Values.eventbusController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
    spec:
      serviceAccountName: {{ .Values.serviceAccount }}
      containers:
--- a/charts/argo-events/templates/eventbus-crd.yaml
+++ b/charts/argo-events/templates/eventbus-crd.yaml
@ -20,4 +20,25 @@ spec:
    - name: v1alpha1
      served: true
      storage: true
+      schema:
+        openAPIV3Schema:
+          properties:
+            apiVersion:
+              type: string
+            kind:
+              type: string
+            metadata:
+              type: object
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+            status:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+          required:
+          - metadata
+          - spec
+          type: object
+      subresources:
+        status: {}
 {{- end }}
--- a/charts/argo-events/templates/eventsource-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml
@ -18,6 +18,9 @@ spec:
      labels:
        app: {{ .Release.Name }}-{{ .Values.eventsourceController.name }}
        release: {{ .Release.Name }}
+      {{- with .Values.eventsourceController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
    spec:
      serviceAccountName: {{ .Values.serviceAccount }}
      containers:
--- a/charts/argo-events/templates/eventsource-crd.yaml
+++ b/charts/argo-events/templates/eventsource-crd.yaml
@ -20,4 +20,25 @@ spec:
    - name: v1alpha1
      served: true
      storage: true
+      schema:
+        openAPIV3Schema:
+          properties:
+            apiVersion:
+              type: string
+            kind:
+              type: string
+            metadata:
+              type: object
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+            status:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+          required:
+          - metadata
+          - spec
+          type: object
+      subresources:
+        status: {}
 {{- end }}
--- a/charts/argo-events/templates/sensor-controller-deployment.yaml
+++ b/charts/argo-events/templates/sensor-controller-deployment.yaml
@ -18,6 +18,9 @@ spec:
      labels:
        app: {{ .Release.Name }}-{{ .Values.sensorController.name }}
        release: {{ .Release.Name }}
+      {{- with .Values.sensorController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
    spec:
      serviceAccountName: {{ .Values.serviceAccount }}
      containers:
--- a/charts/argo-events/templates/sensor-crd.yaml
+++ b/charts/argo-events/templates/sensor-crd.yaml
@ -21,4 +21,25 @@ spec:
    - name: v1alpha1
      served: true
      storage: true
+      schema:
+        openAPIV3Schema:
+          properties:
+            apiVersion:
+              type: string
+            kind:
+              type: string
+            metadata:
+              type: object
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+            status:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+          required:
+          - metadata
+          - spec
+          type: object
+      subresources:
+        status: {}
 {{- end }}
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@ -48,6 +48,7 @@ sensorController:
  tag: v1.2.3
  replicaCount: 1
  sensorImage: sensor
+  podAnnotations: {}
  nodeSelector: {}
  tolerations: {}
  affinity: {}
@ -58,6 +59,7 @@ eventsourceController:
  tag: v1.2.3
  replicaCount: 1
  eventsourceImage: eventsource
+  podAnnotations: {}
  nodeSelector: {}
  tolerations: {}
  affinity: {}
@ -67,6 +69,7 @@ eventbusController:
  image: eventbus-controller
  tag: v1.2.3
  replicaCount: 1
+  podAnnotations: {}
  nodeSelector: {}
  tolerations: {}
  affinity: {}
--- a/charts/argo-rollouts/Chart.yaml
+++ b/charts/argo-rollouts/Chart.yaml
@ -2,7 +2,11 @@ apiVersion: v2
 appVersion: "0.10.2"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
+<<<<<<< HEAD
 version: 1.0.0
+=======
+version: 0.5.0
+>>>>>>> 5955a3bef8409a3edb19a59f6eda32023b255b2c
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
--- a/charts/argo-rollouts/README.md
+++ b/charts/argo-rollouts/README.md
@ -2,7 +2,7 @@ Argo Rollouts Chart
 =============
 A Helm chart for Argo Rollouts, progressive delivery for Kubernetes.

-Current chart version is `0.4.0`
+Current chart version is `0.5.0`

 Source code can be found [here](https://github.com/argoproj/argo-rollouts)

@ -42,6 +42,7 @@ $ helm install --name my-release argo/argo-rollouts
 | controller.metrics.serviceMonitor.enabled | bool | `false` |  |
 | imagePullSecrets | list | `[]` |  |
 | installCRDs | bool | `true` |  |
+| crdAnnotations | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
 | podLabels | object | `{}` |  |
 | serviceAccount.name | string | `"argo-rollouts"` |  |
--- a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml
@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
  name: analysisruns.argoproj.io
 spec:
  group: argoproj.io
@ -16,15 +19,12 @@ spec:
    singular: analysisrun
  scope: Namespaced
  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
-    additionalPrinterColumns:
-    - jsonPath: .status.phase
-      description: AnalysisRun status
+  - additionalPrinterColumns:
+    - description: AnalysisRun status
+      jsonPath: .status.phase
      name: Status
      type: string
-    subresources: {}
+    name: v1alpha1
    schema:
      openAPIV3Schema:
        properties:
@ -723,11 +723,16 @@ spec:
                                                    name:
                                                      type: string
                                                    protocol:
+                                                      default: TCP
                                                      type: string
                                                  required:
                                                  - containerPort
                                                  type: object
                                                type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                              readinessProbe:
                                                properties:
                                                  exec:
@ -794,6 +799,11 @@ spec:
                                                    type: integer
                                                type: object
                                              resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                type: object
                                              securityContext:
                                                properties:
@ -1271,6 +1281,7 @@ spec:
                                                    name:
                                                      type: string
                                                    protocol:
+                                                      default: TCP
                                                      type: string
                                                  required:
                                                  - containerPort
@ -1342,6 +1353,11 @@ spec:
                                                    type: integer
                                                type: object
                                              resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                type: object
                                              securityContext:
                                                properties:
@ -1823,11 +1839,16 @@ spec:
                                                    name:
                                                      type: string
                                                    protocol:
+                                                      default: TCP
                                                      type: string
                                                  required:
                                                  - containerPort
                                                  type: object
                                                type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                              readinessProbe:
                                                properties:
                                                  exec:
@ -1894,6 +1915,11 @@ spec:
                                                    type: integer
                                                type: object
                                              resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                type: object
                                              securityContext:
                                                properties:
@ -2233,503 +2259,12 @@ spec:
                                            - whenUnsatisfiable
                                            type: object
                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - topologyKey
+                                          - whenUnsatisfiable
+                                          x-kubernetes-list-type: map
                                        volumes:
-                                          items:
-                                            properties:
-                                              awsElasticBlockStore:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              azureDisk:
-                                                properties:
-                                                  cachingMode:
-                                                    type: string
-                                                  diskName:
-                                                    type: string
-                                                  diskURI:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  kind:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - diskName
-                                                - diskURI
-                                                type: object
-                                              azureFile:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretName:
-                                                    type: string
-                                                  shareName:
-                                                    type: string
-                                                required:
-                                                - secretName
-                                                - shareName
-                                                type: object
-                                              cephfs:
-                                                properties:
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretFile:
-                                                    type: string
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - monitors
-                                                type: object
-                                              cinder:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              csi:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  nodePublishSecretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeAttributes:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              emptyDir:
-                                                properties:
-                                                  medium:
-                                                    type: string
-                                                  sizeLimit:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                type: object
-                                              ephemeral:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeClaimTemplate:
-                                                    properties:
-                                                      metadata:
-                                                        type: object
-                                                      spec:
-                                                        properties:
-                                                          accessModes:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                          dataSource:
-                                                            properties:
-                                                              apiGroup:
-                                                                type: string
-                                                              kind:
-                                                                type: string
-                                                              name:
-                                                                type: string
-                                                            required:
-                                                            - kind
-                                                            - name
-                                                            type: object
-                                                          resources:
-                                                            properties:
-                                                              limits:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                              requests:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                            type: object
-                                                          selector:
-                                                            properties:
-                                                              matchExpressions:
-                                                                items:
-                                                                  properties:
-                                                                    key:
-                                                                      type: string
-                                                                    operator:
-                                                                      type: string
-                                                                    values:
-                                                                      items:
-                                                                        type: string
-                                                                      type: array
-                                                                  required:
-                                                                  - key
-                                                                  - operator
-                                                                  type: object
-                                                                type: array
-                                                              matchLabels:
-                                                                additionalProperties:
-                                                                  type: string
-                                                                type: object
-                                                            type: object
-                                                          storageClassName:
-                                                            type: string
-                                                          volumeMode:
-                                                            type: string
-                                                          volumeName:
-                                                            type: string
-                                                        type: object
-                                                    required:
-                                                    - spec
-                                                    type: object
-                                                type: object
-                                              fc:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  targetWWNs:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  wwids:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              flexVolume:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  options:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              flocker:
-                                                properties:
-                                                  datasetName:
-                                                    type: string
-                                                  datasetUUID:
-                                                    type: string
-                                                type: object
-                                              gcePersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  pdName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - pdName
-                                                type: object
-                                              gitRepo:
-                                                properties:
-                                                  directory:
-                                                    type: string
-                                                  repository:
-                                                    type: string
-                                                  revision:
-                                                    type: string
-                                                required:
-                                                - repository
-                                                type: object
-                                              glusterfs:
-                                                properties:
-                                                  endpoints:
-                                                    type: string
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - endpoints
-                                                - path
-                                                type: object
-                                              hostPath:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  type:
-                                                    type: string
-                                                required:
-                                                - path
-                                                type: object
-                                              iscsi:
-                                                properties:
-                                                  chapAuthDiscovery:
-                                                    type: boolean
-                                                  chapAuthSession:
-                                                    type: boolean
-                                                  fsType:
-                                                    type: string
-                                                  initiatorName:
-                                                    type: string
-                                                  iqn:
-                                                    type: string
-                                                  iscsiInterface:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  portals:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  targetPortal:
-                                                    type: string
-                                                required:
-                                                - iqn
-                                                - lun
-                                                - targetPortal
-                                                type: object
-                                              name:
-                                                type: string
-                                              nfs:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  server:
-                                                    type: string
-                                                required:
-                                                - path
-                                                - server
-                                                type: object
-                                              persistentVolumeClaim:
-                                                properties:
-                                                  claimName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - claimName
-                                                type: object
-                                              photonPersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  pdID:
-                                                    type: string
-                                                required:
-                                                - pdID
-                                                type: object
-                                              portworxVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              projected:
-                                                properties:
-                                                  defaultMode:
-                                                    format: int32
-                                                    type: integer
-                                                  sources:
-                                                    items:
-                                                      properties:
-                                                        serviceAccountToken:
-                                                          properties:
-                                                            audience:
-                                                              type: string
-                                                            expirationSeconds:
-                                                              format: int64
-                                                              type: integer
-                                                            path:
-                                                              type: string
-                                                          required:
-                                                          - path
-                                                          type: object
-                                                      type: object
-                                                    type: array
-                                                required:
-                                                - sources
-                                                type: object
-                                              quobyte:
-                                                properties:
-                                                  group:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  registry:
-                                                    type: string
-                                                  tenant:
-                                                    type: string
-                                                  user:
-                                                    type: string
-                                                  volume:
-                                                    type: string
-                                                required:
-                                                - registry
-                                                - volume
-                                                type: object
-                                              rbd:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  image:
-                                                    type: string
-                                                  keyring:
-                                                    type: string
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  pool:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - image
-                                                - monitors
-                                                type: object
-                                              scaleIO:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  gateway:
-                                                    type: string
-                                                  protectionDomain:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  sslEnabled:
-                                                    type: boolean
-                                                  storageMode:
-                                                    type: string
-                                                  storagePool:
-                                                    type: string
-                                                  system:
-                                                    type: string
-                                                  volumeName:
-                                                    type: string
-                                                required:
-                                                - gateway
-                                                - secretRef
-                                                - system
-                                                type: object
-                                              storageos:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeName:
-                                                    type: string
-                                                  volumeNamespace:
-                                                    type: string
-                                                type: object
-                                              vsphereVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  storagePolicyID:
-                                                    type: string
-                                                  storagePolicyName:
-                                                    type: string
-                                                  volumePath:
-                                                    type: string
-                                                required:
-                                                - volumePath
-                                                type: object
-                                            required:
-                                            - name
-                                            type: object
-                                          type: array
+                                          x-kubernetes-preserve-unknown-fields: true
                                      required:
                                      - containers
                                      type: object
@ -2960,4 +2495,7 @@ spec:
        required:
        - spec
        type: object
+    served: true
+    storage: true
+    subresources: {}
 {{- end }}
--- a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml
@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
  name: analysistemplates.argoproj.io
 spec:
  group: argoproj.io
@ -17,8 +20,6 @@ spec:
  scope: Namespaced
  versions:
  - name: v1alpha1
-    served: true
-    storage: true
    schema:
      openAPIV3Schema:
        properties:
@ -717,11 +718,16 @@ spec:
                                                    name:
                                                      type: string
                                                    protocol:
+                                                      default: TCP
                                                      type: string
                                                  required:
                                                  - containerPort
                                                  type: object
                                                type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                              readinessProbe:
                                                properties:
                                                  exec:
@ -788,6 +794,11 @@ spec:
                                                    type: integer
                                                type: object
                                              resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                type: object
                                              securityContext:
                                                properties:
@ -1265,6 +1276,7 @@ spec:
                                                    name:
                                                      type: string
                                                    protocol:
+                                                      default: TCP
                                                      type: string
                                                  required:
                                                  - containerPort
@ -1336,6 +1348,11 @@ spec:
                                                    type: integer
                                                type: object
                                              resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                type: object
                                              securityContext:
                                                properties:
@ -1817,11 +1834,16 @@ spec:
                                                    name:
                                                      type: string
                                                    protocol:
+                                                      default: TCP
                                                      type: string
                                                  required:
                                                  - containerPort
                                                  type: object
                                                type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                              readinessProbe:
                                                properties:
                                                  exec:
@ -1888,6 +1910,11 @@ spec:
                                                    type: integer
                                                type: object
                                              resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                type: object
                                              securityContext:
                                                properties:
@ -2227,503 +2254,12 @@ spec:
                                            - whenUnsatisfiable
                                            type: object
                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - topologyKey
+                                          - whenUnsatisfiable
+                                          x-kubernetes-list-type: map
                                        volumes:
-                                          items:
-                                            properties:
-                                              awsElasticBlockStore:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              azureDisk:
-                                                properties:
-                                                  cachingMode:
-                                                    type: string
-                                                  diskName:
-                                                    type: string
-                                                  diskURI:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  kind:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - diskName
-                                                - diskURI
-                                                type: object
-                                              azureFile:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretName:
-                                                    type: string
-                                                  shareName:
-                                                    type: string
-                                                required:
-                                                - secretName
-                                                - shareName
-                                                type: object
-                                              cephfs:
-                                                properties:
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretFile:
-                                                    type: string
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - monitors
-                                                type: object
-                                              cinder:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              csi:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  nodePublishSecretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeAttributes:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              emptyDir:
-                                                properties:
-                                                  medium:
-                                                    type: string
-                                                  sizeLimit:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                type: object
-                                              ephemeral:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeClaimTemplate:
-                                                    properties:
-                                                      metadata:
-                                                        type: object
-                                                      spec:
-                                                        properties:
-                                                          accessModes:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                          dataSource:
-                                                            properties:
-                                                              apiGroup:
-                                                                type: string
-                                                              kind:
-                                                                type: string
-                                                              name:
-                                                                type: string
-                                                            required:
-                                                            - kind
-                                                            - name
-                                                            type: object
-                                                          resources:
-                                                            properties:
-                                                              limits:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                              requests:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                            type: object
-                                                          selector:
-                                                            properties:
-                                                              matchExpressions:
-                                                                items:
-                                                                  properties:
-                                                                    key:
-                                                                      type: string
-                                                                    operator:
-                                                                      type: string
-                                                                    values:
-                                                                      items:
-                                                                        type: string
-                                                                      type: array
-                                                                  required:
-                                                                  - key
-                                                                  - operator
-                                                                  type: object
-                                                                type: array
-                                                              matchLabels:
-                                                                additionalProperties:
-                                                                  type: string
-                                                                type: object
-                                                            type: object
-                                                          storageClassName:
-                                                            type: string
-                                                          volumeMode:
-                                                            type: string
-                                                          volumeName:
-                                                            type: string
-                                                        type: object
-                                                    required:
-                                                    - spec
-                                                    type: object
-                                                type: object
-                                              fc:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  targetWWNs:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  wwids:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              flexVolume:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  options:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              flocker:
-                                                properties:
-                                                  datasetName:
-                                                    type: string
-                                                  datasetUUID:
-                                                    type: string
-                                                type: object
-                                              gcePersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  pdName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - pdName
-                                                type: object
-                                              gitRepo:
-                                                properties:
-                                                  directory:
-                                                    type: string
-                                                  repository:
-                                                    type: string
-                                                  revision:
-                                                    type: string
-                                                required:
-                                                - repository
-                                                type: object
-                                              glusterfs:
-                                                properties:
-                                                  endpoints:
-                                                    type: string
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - endpoints
-                                                - path
-                                                type: object
-                                              hostPath:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  type:
-                                                    type: string
-                                                required:
-                                                - path
-                                                type: object
-                                              iscsi:
-                                                properties:
-                                                  chapAuthDiscovery:
-                                                    type: boolean
-                                                  chapAuthSession:
-                                                    type: boolean
-                                                  fsType:
-                                                    type: string
-                                                  initiatorName:
-                                                    type: string
-                                                  iqn:
-                                                    type: string
-                                                  iscsiInterface:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  portals:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  targetPortal:
-                                                    type: string
-                                                required:
-                                                - iqn
-                                                - lun
-                                                - targetPortal
-                                                type: object
-                                              name:
-                                                type: string
-                                              nfs:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  server:
-                                                    type: string
-                                                required:
-                                                - path
-                                                - server
-                                                type: object
-                                              persistentVolumeClaim:
-                                                properties:
-                                                  claimName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - claimName
-                                                type: object
-                                              photonPersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  pdID:
-                                                    type: string
-                                                required:
-                                                - pdID
-                                                type: object
-                                              portworxVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              projected:
-                                                properties:
-                                                  defaultMode:
-                                                    format: int32
-                                                    type: integer
-                                                  sources:
-                                                    items:
-                                                      properties:
-                                                        serviceAccountToken:
-                                                          properties:
-                                                            audience:
-                                                              type: string
-                                                            expirationSeconds:
-                                                              format: int64
-                                                              type: integer
-                                                            path:
-                                                              type: string
-                                                          required:
-                                                          - path
-                                                          type: object
-                                                      type: object
-                                                    type: array
-                                                required:
-                                                - sources
-                                                type: object
-                                              quobyte:
-                                                properties:
-                                                  group:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  registry:
-                                                    type: string
-                                                  tenant:
-                                                    type: string
-                                                  user:
-                                                    type: string
-                                                  volume:
-                                                    type: string
-                                                required:
-                                                - registry
-                                                - volume
-                                                type: object
-                                              rbd:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  image:
-                                                    type: string
-                                                  keyring:
-                                                    type: string
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  pool:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - image
-                                                - monitors
-                                                type: object
-                                              scaleIO:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  gateway:
-                                                    type: string
-                                                  protectionDomain:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  sslEnabled:
-                                                    type: boolean
-                                                  storageMode:
-                                                    type: string
-                                                  storagePool:
-                                                    type: string
-                                                  system:
-                                                    type: string
-                                                  volumeName:
-                                                    type: string
-                                                required:
-                                                - gateway
-                                                - secretRef
-                                                - system
-                                                type: object
-                                              storageos:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeName:
-                                                    type: string
-                                                  volumeNamespace:
-                                                    type: string
-                                                type: object
-                                              vsphereVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  storagePolicyID:
-                                                    type: string
-                                                  storagePolicyName:
-                                                    type: string
-                                                  volumePath:
-                                                    type: string
-                                                required:
-                                                - volumePath
-                                                type: object
-                                            required:
-                                            - name
-                                            type: object
-                                          type: array
+                                          x-kubernetes-preserve-unknown-fields: true
                                      required:
                                      - containers
                                      type: object
@ -2882,4 +2418,6 @@ spec:
        required:
        - spec
        type: object
+    served: true
+    storage: true
 {{- end }}
--- a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml
@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
  name: clusteranalysistemplates.argoproj.io
 spec:
  group: argoproj.io
@ -17,8 +20,6 @@ spec:
  scope: Cluster
  versions:
  - name: v1alpha1
-    served: true
-    storage: true
    schema:
      openAPIV3Schema:
        properties:
@ -717,11 +718,16 @@ spec:
                                                    name:
                                                      type: string
                                                    protocol:
+                                                      default: TCP
                                                      type: string
                                                  required:
                                                  - containerPort
                                                  type: object
                                                type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                              readinessProbe:
                                                properties:
                                                  exec:
@ -788,6 +794,11 @@ spec:
                                                    type: integer
                                                type: object
                                              resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                type: object
                                              securityContext:
                                                properties:
@ -1265,6 +1276,7 @@ spec:
                                                    name:
                                                      type: string
                                                    protocol:
+                                                      default: TCP
                                                      type: string
                                                  required:
                                                  - containerPort
@ -1336,6 +1348,11 @@ spec:
                                                    type: integer
                                                type: object
                                              resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                type: object
                                              securityContext:
                                                properties:
@ -1817,11 +1834,16 @@ spec:
                                                    name:
                                                      type: string
                                                    protocol:
+                                                      default: TCP
                                                      type: string
                                                  required:
                                                  - containerPort
                                                  type: object
                                                type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                              readinessProbe:
                                                properties:
                                                  exec:
@ -1888,6 +1910,11 @@ spec:
                                                    type: integer
                                                type: object
                                              resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                type: object
                                              securityContext:
                                                properties:
@ -2227,503 +2254,12 @@ spec:
                                            - whenUnsatisfiable
                                            type: object
                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - topologyKey
+                                          - whenUnsatisfiable
+                                          x-kubernetes-list-type: map
                                        volumes:
-                                          items:
-                                            properties:
-                                              awsElasticBlockStore:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              azureDisk:
-                                                properties:
-                                                  cachingMode:
-                                                    type: string
-                                                  diskName:
-                                                    type: string
-                                                  diskURI:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  kind:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - diskName
-                                                - diskURI
-                                                type: object
-                                              azureFile:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretName:
-                                                    type: string
-                                                  shareName:
-                                                    type: string
-                                                required:
-                                                - secretName
-                                                - shareName
-                                                type: object
-                                              cephfs:
-                                                properties:
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretFile:
-                                                    type: string
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - monitors
-                                                type: object
-                                              cinder:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              csi:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  nodePublishSecretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeAttributes:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              emptyDir:
-                                                properties:
-                                                  medium:
-                                                    type: string
-                                                  sizeLimit:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                type: object
-                                              ephemeral:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeClaimTemplate:
-                                                    properties:
-                                                      metadata:
-                                                        type: object
-                                                      spec:
-                                                        properties:
-                                                          accessModes:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                          dataSource:
-                                                            properties:
-                                                              apiGroup:
-                                                                type: string
-                                                              kind:
-                                                                type: string
-                                                              name:
-                                                                type: string
-                                                            required:
-                                                            - kind
-                                                            - name
-                                                            type: object
-                                                          resources:
-                                                            properties:
-                                                              limits:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                              requests:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                            type: object
-                                                          selector:
-                                                            properties:
-                                                              matchExpressions:
-                                                                items:
-                                                                  properties:
-                                                                    key:
-                                                                      type: string
-                                                                    operator:
-                                                                      type: string
-                                                                    values:
-                                                                      items:
-                                                                        type: string
-                                                                      type: array
-                                                                  required:
-                                                                  - key
-                                                                  - operator
-                                                                  type: object
-                                                                type: array
-                                                              matchLabels:
-                                                                additionalProperties:
-                                                                  type: string
-                                                                type: object
-                                                            type: object
-                                                          storageClassName:
-                                                            type: string
-                                                          volumeMode:
-                                                            type: string
-                                                          volumeName:
-                                                            type: string
-                                                        type: object
-                                                    required:
-                                                    - spec
-                                                    type: object
-                                                type: object
-                                              fc:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  targetWWNs:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  wwids:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              flexVolume:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  options:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              flocker:
-                                                properties:
-                                                  datasetName:
-                                                    type: string
-                                                  datasetUUID:
-                                                    type: string
-                                                type: object
-                                              gcePersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  pdName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - pdName
-                                                type: object
-                                              gitRepo:
-                                                properties:
-                                                  directory:
-                                                    type: string
-                                                  repository:
-                                                    type: string
-                                                  revision:
-                                                    type: string
-                                                required:
-                                                - repository
-                                                type: object
-                                              glusterfs:
-                                                properties:
-                                                  endpoints:
-                                                    type: string
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - endpoints
-                                                - path
-                                                type: object
-                                              hostPath:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  type:
-                                                    type: string
-                                                required:
-                                                - path
-                                                type: object
-                                              iscsi:
-                                                properties:
-                                                  chapAuthDiscovery:
-                                                    type: boolean
-                                                  chapAuthSession:
-                                                    type: boolean
-                                                  fsType:
-                                                    type: string
-                                                  initiatorName:
-                                                    type: string
-                                                  iqn:
-                                                    type: string
-                                                  iscsiInterface:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  portals:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  targetPortal:
-                                                    type: string
-                                                required:
-                                                - iqn
-                                                - lun
-                                                - targetPortal
-                                                type: object
-                                              name:
-                                                type: string
-                                              nfs:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  server:
-                                                    type: string
-                                                required:
-                                                - path
-                                                - server
-                                                type: object
-                                              persistentVolumeClaim:
-                                                properties:
-                                                  claimName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - claimName
-                                                type: object
-                                              photonPersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  pdID:
-                                                    type: string
-                                                required:
-                                                - pdID
-                                                type: object
-                                              portworxVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              projected:
-                                                properties:
-                                                  defaultMode:
-                                                    format: int32
-                                                    type: integer
-                                                  sources:
-                                                    items:
-                                                      properties:
-                                                        serviceAccountToken:
-                                                          properties:
-                                                            audience:
-                                                              type: string
-                                                            expirationSeconds:
-                                                              format: int64
-                                                              type: integer
-                                                            path:
-                                                              type: string
-                                                          required:
-                                                          - path
-                                                          type: object
-                                                      type: object
-                                                    type: array
-                                                required:
-                                                - sources
-                                                type: object
-                                              quobyte:
-                                                properties:
-                                                  group:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  registry:
-                                                    type: string
-                                                  tenant:
-                                                    type: string
-                                                  user:
-                                                    type: string
-                                                  volume:
-                                                    type: string
-                                                required:
-                                                - registry
-                                                - volume
-                                                type: object
-                                              rbd:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  image:
-                                                    type: string
-                                                  keyring:
-                                                    type: string
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  pool:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - image
-                                                - monitors
-                                                type: object
-                                              scaleIO:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  gateway:
-                                                    type: string
-                                                  protectionDomain:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  sslEnabled:
-                                                    type: boolean
-                                                  storageMode:
-                                                    type: string
-                                                  storagePool:
-                                                    type: string
-                                                  system:
-                                                    type: string
-                                                  volumeName:
-                                                    type: string
-                                                required:
-                                                - gateway
-                                                - secretRef
-                                                - system
-                                                type: object
-                                              storageos:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeName:
-                                                    type: string
-                                                  volumeNamespace:
-                                                    type: string
-                                                type: object
-                                              vsphereVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  storagePolicyID:
-                                                    type: string
-                                                  storagePolicyName:
-                                                    type: string
-                                                  volumePath:
-                                                    type: string
-                                                required:
-                                                - volumePath
-                                                type: object
-                                            required:
-                                            - name
-                                            type: object
-                                          type: array
+                                          x-kubernetes-preserve-unknown-fields: true
                                      required:
                                      - containers
                                      type: object
@ -2882,4 +2418,6 @@ spec:
        required:
        - spec
        type: object
+    served: true
+    storage: true
 {{- end }}
--- a/charts/argo-rollouts/templates/crds/experiment-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/experiment-crd.yaml
@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
  name: experiments.argoproj.io
 spec:
  group: argoproj.io
@ -16,15 +19,12 @@ spec:
    singular: experiment
  scope: Namespaced
  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
-    subresources: {}
-    additionalPrinterColumns:
-    - jsonPath: .status.phase
-      description: Experiment status
+  - additionalPrinterColumns:
+    - description: Experiment status
+      jsonPath: .status.phase
      name: Status
      type: string
+    name: v1alpha1
    schema:
      openAPIV3Schema:
        properties:
@ -684,11 +684,16 @@ spec:
                                        name:
                                          type: string
                                        protocol:
+                                          default: TCP
                                          type: string
                                      required:
                                      - containerPort
                                      type: object
                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - containerPort
+                                    - protocol
+                                    x-kubernetes-list-type: map
                                  readinessProbe:
                                    properties:
                                      exec:
@ -755,6 +760,11 @@ spec:
                                        type: integer
                                    type: object
                                  resources:
+                                    properties:
+                                      limits:
+                                        x-kubernetes-preserve-unknown-fields: true
+                                      requests:
+                                        x-kubernetes-preserve-unknown-fields: true
                                    type: object
                                  securityContext:
                                    properties:
@ -796,6 +806,15 @@ spec:
                                          user:
                                            type: string
                                        type: object
+                                      seccompProfile:
+                                        properties:
+                                          localhostProfile:
+                                            type: string
+                                          type:
+                                            type: string
+                                        required:
+                                        - type
+                                        type: object
                                      windowsOptions:
                                        properties:
                                          gmsaCredentialSpec:
@ -1223,6 +1242,7 @@ spec:
                                        name:
                                          type: string
                                        protocol:
+                                          default: TCP
                                          type: string
                                      required:
                                      - containerPort
@ -1294,6 +1314,11 @@ spec:
                                        type: integer
                                    type: object
                                  resources:
+                                    properties:
+                                      limits:
+                                        x-kubernetes-preserve-unknown-fields: true
+                                      requests:
+                                        x-kubernetes-preserve-unknown-fields: true
                                    type: object
                                  securityContext:
                                    properties:
@ -1335,6 +1360,15 @@ spec:
                                          user:
                                            type: string
                                        type: object
+                                      seccompProfile:
+                                        properties:
+                                          localhostProfile:
+                                            type: string
+                                          type:
+                                            type: string
+                                        required:
+                                        - type
+                                        type: object
                                      windowsOptions:
                                        properties:
                                          gmsaCredentialSpec:
@ -1766,11 +1800,16 @@ spec:
                                        name:
                                          type: string
                                        protocol:
+                                          default: TCP
                                          type: string
                                      required:
                                      - containerPort
                                      type: object
                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - containerPort
+                                    - protocol
+                                    x-kubernetes-list-type: map
                                  readinessProbe:
                                    properties:
                                      exec:
@ -1837,6 +1876,11 @@ spec:
                                        type: integer
                                    type: object
                                  resources:
+                                    properties:
+                                      limits:
+                                        x-kubernetes-preserve-unknown-fields: true
+                                      requests:
+                                        x-kubernetes-preserve-unknown-fields: true
                                    type: object
                                  securityContext:
                                    properties:
@ -1878,6 +1922,15 @@ spec:
                                          user:
                                            type: string
                                        type: object
+                                      seccompProfile:
+                                        properties:
+                                          localhostProfile:
+                                            type: string
+                                          type:
+                                            type: string
+                                        required:
+                                        - type
+                                        type: object
                                      windowsOptions:
                                        properties:
                                          gmsaCredentialSpec:
@ -2063,6 +2116,15 @@ spec:
                                    user:
                                      type: string
                                  type: object
+                                seccompProfile:
+                                  properties:
+                                    localhostProfile:
+                                      type: string
+                                    type:
+                                      type: string
+                                  required:
+                                  - type
+                                  type: object
                                supplementalGroups:
                                  items:
                                    format: int64
@ -2094,6 +2156,8 @@ spec:
                              type: string
                            serviceAccountName:
                              type: string
+                            setHostnameAsFQDN:
+                              type: boolean
                            shareProcessNamespace:
                              type: boolean
                            subdomain:
@ -2156,424 +2220,12 @@ spec:
                                - whenUnsatisfiable
                                type: object
                              type: array
+                              x-kubernetes-list-map-keys:
+                              - topologyKey
+                              - whenUnsatisfiable
+                              x-kubernetes-list-type: map
                            volumes:
-                              items:
-                                properties:
-                                  awsElasticBlockStore:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      partition:
-                                        format: int32
-                                        type: integer
-                                      readOnly:
-                                        type: boolean
-                                      volumeID:
-                                        type: string
-                                    required:
-                                    - volumeID
-                                    type: object
-                                  azureDisk:
-                                    properties:
-                                      cachingMode:
-                                        type: string
-                                      diskName:
-                                        type: string
-                                      diskURI:
-                                        type: string
-                                      fsType:
-                                        type: string
-                                      kind:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                    required:
-                                    - diskName
-                                    - diskURI
-                                    type: object
-                                  azureFile:
-                                    properties:
-                                      readOnly:
-                                        type: boolean
-                                      secretName:
-                                        type: string
-                                      shareName:
-                                        type: string
-                                    required:
-                                    - secretName
-                                    - shareName
-                                    type: object
-                                  cephfs:
-                                    properties:
-                                      monitors:
-                                        items:
-                                          type: string
-                                        type: array
-                                      path:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretFile:
-                                        type: string
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      user:
-                                        type: string
-                                    required:
-                                    - monitors
-                                    type: object
-                                  cinder:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      volumeID:
-                                        type: string
-                                    required:
-                                    - volumeID
-                                    type: object
-                                  csi:
-                                    properties:
-                                      driver:
-                                        type: string
-                                      fsType:
-                                        type: string
-                                      nodePublishSecretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      readOnly:
-                                        type: boolean
-                                      volumeAttributes:
-                                        additionalProperties:
-                                          type: string
-                                        type: object
-                                    required:
-                                    - driver
-                                    type: object
-                                  emptyDir:
-                                    properties:
-                                      medium:
-                                        type: string
-                                      sizeLimit:
-                                        anyOf:
-                                        - type: integer
-                                        - type: string
-                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                        x-kubernetes-int-or-string: true
-                                    type: object
-                                  fc:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      lun:
-                                        format: int32
-                                        type: integer
-                                      readOnly:
-                                        type: boolean
-                                      targetWWNs:
-                                        items:
-                                          type: string
-                                        type: array
-                                      wwids:
-                                        items:
-                                          type: string
-                                        type: array
-                                    type: object
-                                  flexVolume:
-                                    properties:
-                                      driver:
-                                        type: string
-                                      fsType:
-                                        type: string
-                                      options:
-                                        additionalProperties:
-                                          type: string
-                                        type: object
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                    required:
-                                    - driver
-                                    type: object
-                                  flocker:
-                                    properties:
-                                      datasetName:
-                                        type: string
-                                      datasetUUID:
-                                        type: string
-                                    type: object
-                                  gcePersistentDisk:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      partition:
-                                        format: int32
-                                        type: integer
-                                      pdName:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                    required:
-                                    - pdName
-                                    type: object
-                                  gitRepo:
-                                    properties:
-                                      directory:
-                                        type: string
-                                      repository:
-                                        type: string
-                                      revision:
-                                        type: string
-                                    required:
-                                    - repository
-                                    type: object
-                                  glusterfs:
-                                    properties:
-                                      endpoints:
-                                        type: string
-                                      path:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                    required:
-                                    - endpoints
-                                    - path
-                                    type: object
-                                  hostPath:
-                                    properties:
-                                      path:
-                                        type: string
-                                      type:
-                                        type: string
-                                    required:
-                                    - path
-                                    type: object
-                                  iscsi:
-                                    properties:
-                                      chapAuthDiscovery:
-                                        type: boolean
-                                      chapAuthSession:
-                                        type: boolean
-                                      fsType:
-                                        type: string
-                                      initiatorName:
-                                        type: string
-                                      iqn:
-                                        type: string
-                                      iscsiInterface:
-                                        type: string
-                                      lun:
-                                        format: int32
-                                        type: integer
-                                      portals:
-                                        items:
-                                          type: string
-                                        type: array
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      targetPortal:
-                                        type: string
-                                    required:
-                                    - iqn
-                                    - lun
-                                    - targetPortal
-                                    type: object
-                                  name:
-                                    type: string
-                                  nfs:
-                                    properties:
-                                      path:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      server:
-                                        type: string
-                                    required:
-                                    - path
-                                    - server
-                                    type: object
-                                  persistentVolumeClaim:
-                                    properties:
-                                      claimName:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                    required:
-                                    - claimName
-                                    type: object
-                                  photonPersistentDisk:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      pdID:
-                                        type: string
-                                    required:
-                                    - pdID
-                                    type: object
-                                  portworxVolume:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      volumeID:
-                                        type: string
-                                    required:
-                                    - volumeID
-                                    type: object
-                                  projected:
-                                    properties:
-                                      defaultMode:
-                                        format: int32
-                                        type: integer
-                                      sources:
-                                        items:
-                                          properties:
-                                            serviceAccountToken:
-                                              properties:
-                                                audience:
-                                                  type: string
-                                                expirationSeconds:
-                                                  format: int64
-                                                  type: integer
-                                                path:
-                                                  type: string
-                                              required:
-                                              - path
-                                              type: object
-                                          type: object
-                                        type: array
-                                    required:
-                                    - sources
-                                    type: object
-                                  quobyte:
-                                    properties:
-                                      group:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      registry:
-                                        type: string
-                                      tenant:
-                                        type: string
-                                      user:
-                                        type: string
-                                      volume:
-                                        type: string
-                                    required:
-                                    - registry
-                                    - volume
-                                    type: object
-                                  rbd:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      image:
-                                        type: string
-                                      keyring:
-                                        type: string
-                                      monitors:
-                                        items:
-                                          type: string
-                                        type: array
-                                      pool:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      user:
-                                        type: string
-                                    required:
-                                    - image
-                                    - monitors
-                                    type: object
-                                  scaleIO:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      gateway:
-                                        type: string
-                                      protectionDomain:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      sslEnabled:
-                                        type: boolean
-                                      storageMode:
-                                        type: string
-                                      storagePool:
-                                        type: string
-                                      system:
-                                        type: string
-                                      volumeName:
-                                        type: string
-                                    required:
-                                    - gateway
-                                    - secretRef
-                                    - system
-                                    type: object
-                                  storageos:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      volumeName:
-                                        type: string
-                                      volumeNamespace:
-                                        type: string
-                                    type: object
-                                  vsphereVolume:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      storagePolicyID:
-                                        type: string
-                                      storagePolicyName:
-                                        type: string
-                                      volumePath:
-                                        type: string
-                                    required:
-                                    - volumePath
-                                    type: object
-                                required:
-                                - name
-                                type: object
-                              type: array
+                              x-kubernetes-preserve-unknown-fields: true
                          required:
                          - containers
                          type: object
@ -2680,4 +2332,7 @@ spec:
        required:
        - spec
        type: object
+    served: true
+    storage: true
+    subresources: {}
 {{- end }}
--- a/charts/argo-rollouts/templates/crds/rollout-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/rollout-crd.yaml
@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
  name: rollouts.argoproj.io
 spec:
  group: argoproj.io
@ -16,32 +19,24 @@ spec:
    singular: rollout
  scope: Namespaced
  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
-    additionalPrinterColumns:
-    - jsonPath: .spec.replicas
-      description: Number of desired pods
+  - additionalPrinterColumns:
+    - description: Number of desired pods
+      jsonPath: .spec.replicas
      name: Desired
      type: integer
-    - jsonPath: .status.replicas
-      description: Total number of non-terminated pods targeted by this rollout
+    - description: Total number of non-terminated pods targeted by this rollout
+      jsonPath: .status.replicas
      name: Current
      type: integer
-    - jsonPath: .status.updatedReplicas
-      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
-    - jsonPath: .status.availableReplicas
-      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
-    subresources:
-      scale:
-        labelSelectorPath: .status.selector
-        specReplicasPath: .spec.replicas
-        statusReplicasPath: .status.HPAReplicas
-      status: {}
+    name: v1alpha1
    schema:
      openAPIV3Schema:
        properties:
@ -158,10 +153,6 @@ spec:
                              - name
                              type: object
                            type: array
-                          clusterScope:
-                            type: boolean
-                          templateName:
-                            type: string
                          templates:
                            items:
                              properties:
@ -197,10 +188,6 @@ spec:
                              - name
                              type: object
                            type: array
-                          clusterScope:
-                            type: boolean
-                          templateName:
-                            type: string
                          templates:
                            items:
                              properties:
@ -263,13 +250,9 @@ spec:
                              - name
                              type: object
                            type: array
-                          clusterScope:
-                            type: boolean
                          startingStep:
                            format: int32
                            type: integer
-                          templateName:
-                            type: string
                          templates:
                            items:
                              properties:
@ -357,10 +340,6 @@ spec:
                                    - name
                                    type: object
                                  type: array
-                                clusterScope:
-                                  type: boolean
-                                templateName:
-                                  type: string
                                templates:
                                  items:
                                    properties:
@ -1122,11 +1101,16 @@ spec:
                                  name:
                                    type: string
                                  protocol:
+                                    default: TCP
                                    type: string
                                required:
                                - containerPort
                                type: object
                              type: array
+                              x-kubernetes-list-map-keys:
+                              - containerPort
+                              - protocol
+                              x-kubernetes-list-type: map
                            readinessProbe:
                              properties:
                                exec:
@ -1193,6 +1177,11 @@ spec:
                                  type: integer
                              type: object
                            resources:
+                              properties:
+                                limits:
+                                  x-kubernetes-preserve-unknown-fields: true
+                                requests:
+                                  x-kubernetes-preserve-unknown-fields: true
                              type: object
                            securityContext:
                              properties:
@ -1670,6 +1659,7 @@ spec:
                                  name:
                                    type: string
                                  protocol:
+                                    default: TCP
                                    type: string
                                required:
                                - containerPort
@ -1741,6 +1731,11 @@ spec:
                                  type: integer
                              type: object
                            resources:
+                              properties:
+                                limits:
+                                  x-kubernetes-preserve-unknown-fields: true
+                                requests:
+                                  x-kubernetes-preserve-unknown-fields: true
                              type: object
                            securityContext:
                              properties:
@ -2222,11 +2217,16 @@ spec:
                                  name:
                                    type: string
                                  protocol:
+                                    default: TCP
                                    type: string
                                required:
                                - containerPort
                                type: object
                              type: array
+                              x-kubernetes-list-map-keys:
+                              - containerPort
+                              - protocol
+                              x-kubernetes-list-type: map
                            readinessProbe:
                              properties:
                                exec:
@ -2293,6 +2293,11 @@ spec:
                                  type: integer
                              type: object
                            resources:
+                              properties:
+                                limits:
+                                  x-kubernetes-preserve-unknown-fields: true
+                                requests:
+                                  x-kubernetes-preserve-unknown-fields: true
                              type: object
                            securityContext:
                              properties:
@ -2632,670 +2637,12 @@ spec:
                          - whenUnsatisfiable
                          type: object
                        type: array
+                        x-kubernetes-list-map-keys:
+                        - topologyKey
+                        - whenUnsatisfiable
+                        x-kubernetes-list-type: map
                      volumes:
-                        items:
-                          properties:
-                            awsElasticBlockStore:
-                              properties:
-                                fsType:
-                                  type: string
-                                partition:
-                                  format: int32
-                                  type: integer
-                                readOnly:
-                                  type: boolean
-                                volumeID:
-                                  type: string
-                              required:
-                              - volumeID
-                              type: object
-                            azureDisk:
-                              properties:
-                                cachingMode:
-                                  type: string
-                                diskName:
-                                  type: string
-                                diskURI:
-                                  type: string
-                                fsType:
-                                  type: string
-                                kind:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                              required:
-                              - diskName
-                              - diskURI
-                              type: object
-                            azureFile:
-                              properties:
-                                readOnly:
-                                  type: boolean
-                                secretName:
-                                  type: string
-                                shareName:
-                                  type: string
-                              required:
-                              - secretName
-                              - shareName
-                              type: object
-                            cephfs:
-                              properties:
-                                monitors:
-                                  items:
-                                    type: string
-                                  type: array
-                                path:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretFile:
-                                  type: string
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                user:
-                                  type: string
-                              required:
-                              - monitors
-                              type: object
-                            cinder:
-                              properties:
-                                fsType:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                volumeID:
-                                  type: string
-                              required:
-                              - volumeID
-                              type: object
-                            configMap:
-                              properties:
-                                defaultMode:
-                                  format: int32
-                                  type: integer
-                                items:
-                                  items:
-                                    properties:
-                                      key:
-                                        type: string
-                                      mode:
-                                        format: int32
-                                        type: integer
-                                      path:
-                                        type: string
-                                    required:
-                                    - key
-                                    - path
-                                    type: object
-                                  type: array
-                                name:
-                                  type: string
-                                optional:
-                                  type: boolean
-                              type: object
-                            csi:
-                              properties:
-                                driver:
-                                  type: string
-                                fsType:
-                                  type: string
-                                nodePublishSecretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                readOnly:
-                                  type: boolean
-                                volumeAttributes:
-                                  additionalProperties:
-                                    type: string
-                                  type: object
-                              required:
-                              - driver
-                              type: object
-                            downwardAPI:
-                              properties:
-                                defaultMode:
-                                  format: int32
-                                  type: integer
-                                items:
-                                  items:
-                                    properties:
-                                      fieldRef:
-                                        properties:
-                                          apiVersion:
-                                            type: string
-                                          fieldPath:
-                                            type: string
-                                        required:
-                                        - fieldPath
-                                        type: object
-                                      mode:
-                                        format: int32
-                                        type: integer
-                                      path:
-                                        type: string
-                                      resourceFieldRef:
-                                        properties:
-                                          containerName:
-                                            type: string
-                                          divisor:
-                                            type: string
-                                          resource:
-                                            type: string
-                                        required:
-                                        - resource
-                                        type: object
-                                    required:
-                                    - path
-                                    type: object
-                                  type: array
-                              type: object
-                            emptyDir:
-                              properties:
-                                medium:
-                                  type: string
-                                sizeLimit:
-                                  anyOf:
-                                  - type: integer
-                                  - type: string
-                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                  x-kubernetes-int-or-string: true
-                              type: object
-                            ephemeral:
-                              properties:
-                                readOnly:
-                                  type: boolean
-                                volumeClaimTemplate:
-                                  properties:
-                                    metadata:
-                                      type: object
-                                    spec:
-                                      properties:
-                                        accessModes:
-                                          items:
-                                            type: string
-                                          type: array
-                                        dataSource:
-                                          properties:
-                                            apiGroup:
-                                              type: string
-                                            kind:
-                                              type: string
-                                            name:
-                                              type: string
-                                          required:
-                                          - kind
-                                          - name
-                                          type: object
-                                        resources:
-                                          properties:
-                                            limits:
-                                              additionalProperties:
-                                                anyOf:
-                                                - type: integer
-                                                - type: string
-                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                x-kubernetes-int-or-string: true
-                                              type: object
-                                            requests:
-                                              additionalProperties:
-                                                anyOf:
-                                                - type: integer
-                                                - type: string
-                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                x-kubernetes-int-or-string: true
-                                              type: object
-                                          type: object
-                                        selector:
-                                          properties:
-                                            matchExpressions:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                required:
-                                                - key
-                                                - operator
-                                                type: object
-                                              type: array
-                                            matchLabels:
-                                              additionalProperties:
-                                                type: string
-                                              type: object
-                                          type: object
-                                        storageClassName:
-                                          type: string
-                                        volumeMode:
-                                          type: string
-                                        volumeName:
-                                          type: string
-                                      type: object
-                                  required:
-                                  - spec
-                                  type: object
-                              type: object
-                            fc:
-                              properties:
-                                fsType:
-                                  type: string
-                                lun:
-                                  format: int32
-                                  type: integer
-                                readOnly:
-                                  type: boolean
-                                targetWWNs:
-                                  items:
-                                    type: string
-                                  type: array
-                                wwids:
-                                  items:
-                                    type: string
-                                  type: array
-                              type: object
-                            flexVolume:
-                              properties:
-                                driver:
-                                  type: string
-                                fsType:
-                                  type: string
-                                options:
-                                  additionalProperties:
-                                    type: string
-                                  type: object
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                              required:
-                              - driver
-                              type: object
-                            flocker:
-                              properties:
-                                datasetName:
-                                  type: string
-                                datasetUUID:
-                                  type: string
-                              type: object
-                            gcePersistentDisk:
-                              properties:
-                                fsType:
-                                  type: string
-                                partition:
-                                  format: int32
-                                  type: integer
-                                pdName:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                              required:
-                              - pdName
-                              type: object
-                            gitRepo:
-                              properties:
-                                directory:
-                                  type: string
-                                repository:
-                                  type: string
-                                revision:
-                                  type: string
-                              required:
-                              - repository
-                              type: object
-                            glusterfs:
-                              properties:
-                                endpoints:
-                                  type: string
-                                path:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                              required:
-                              - endpoints
-                              - path
-                              type: object
-                            hostPath:
-                              properties:
-                                path:
-                                  type: string
-                                type:
-                                  type: string
-                              required:
-                              - path
-                              type: object
-                            iscsi:
-                              properties:
-                                chapAuthDiscovery:
-                                  type: boolean
-                                chapAuthSession:
-                                  type: boolean
-                                fsType:
-                                  type: string
-                                initiatorName:
-                                  type: string
-                                iqn:
-                                  type: string
-                                iscsiInterface:
-                                  type: string
-                                lun:
-                                  format: int32
-                                  type: integer
-                                portals:
-                                  items:
-                                    type: string
-                                  type: array
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                targetPortal:
-                                  type: string
-                              required:
-                              - iqn
-                              - lun
-                              - targetPortal
-                              type: object
-                            name:
-                              type: string
-                            nfs:
-                              properties:
-                                path:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                server:
-                                  type: string
-                              required:
-                              - path
-                              - server
-                              type: object
-                            persistentVolumeClaim:
-                              properties:
-                                claimName:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                              required:
-                              - claimName
-                              type: object
-                            photonPersistentDisk:
-                              properties:
-                                fsType:
-                                  type: string
-                                pdID:
-                                  type: string
-                              required:
-                              - pdID
-                              type: object
-                            portworxVolume:
-                              properties:
-                                fsType:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                volumeID:
-                                  type: string
-                              required:
-                              - volumeID
-                              type: object
-                            projected:
-                              properties:
-                                defaultMode:
-                                  format: int32
-                                  type: integer
-                                sources:
-                                  items:
-                                    properties:
-                                      configMap:
-                                        properties:
-                                          items:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                mode:
-                                                  format: int32
-                                                  type: integer
-                                                path:
-                                                  type: string
-                                              required:
-                                              - key
-                                              - path
-                                              type: object
-                                            type: array
-                                          name:
-                                            type: string
-                                          optional:
-                                            type: boolean
-                                        type: object
-                                      downwardAPI:
-                                        properties:
-                                          items:
-                                            items:
-                                              properties:
-                                                fieldRef:
-                                                  properties:
-                                                    apiVersion:
-                                                      type: string
-                                                    fieldPath:
-                                                      type: string
-                                                  required:
-                                                  - fieldPath
-                                                  type: object
-                                                mode:
-                                                  format: int32
-                                                  type: integer
-                                                path:
-                                                  type: string
-                                                resourceFieldRef:
-                                                  properties:
-                                                    containerName:
-                                                      type: string
-                                                    divisor:
-                                                      type: string
-                                                    resource:
-                                                      type: string
-                                                  required:
-                                                  - resource
-                                                  type: object
-                                              required:
-                                              - path
-                                              type: object
-                                            type: array
-                                        type: object
-                                      secret:
-                                        properties:
-                                          items:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                mode:
-                                                  format: int32
-                                                  type: integer
-                                                path:
-                                                  type: string
-                                              required:
-                                              - key
-                                              - path
-                                              type: object
-                                            type: array
-                                          name:
-                                            type: string
-                                          optional:
-                                            type: boolean
-                                        type: object
-                                      serviceAccountToken:
-                                        properties:
-                                          audience:
-                                            type: string
-                                          expirationSeconds:
-                                            format: int64
-                                            type: integer
-                                          path:
-                                            type: string
-                                        required:
-                                        - path
-                                        type: object
-                                    type: object
-                                  type: array
-                              required:
-                              - sources
-                              type: object
-                            quobyte:
-                              properties:
-                                group:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                registry:
-                                  type: string
-                                tenant:
-                                  type: string
-                                user:
-                                  type: string
-                                volume:
-                                  type: string
-                              required:
-                              - registry
-                              - volume
-                              type: object
-                            rbd:
-                              properties:
-                                fsType:
-                                  type: string
-                                image:
-                                  type: string
-                                keyring:
-                                  type: string
-                                monitors:
-                                  items:
-                                    type: string
-                                  type: array
-                                pool:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                user:
-                                  type: string
-                              required:
-                              - image
-                              - monitors
-                              type: object
-                            scaleIO:
-                              properties:
-                                fsType:
-                                  type: string
-                                gateway:
-                                  type: string
-                                protectionDomain:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                sslEnabled:
-                                  type: boolean
-                                storageMode:
-                                  type: string
-                                storagePool:
-                                  type: string
-                                system:
-                                  type: string
-                                volumeName:
-                                  type: string
-                              required:
-                              - gateway
-                              - secretRef
-                              - system
-                              type: object
-                            secret:
-                              properties:
-                                defaultMode:
-                                  format: int32
-                                  type: integer
-                                items:
-                                  items:
-                                    properties:
-                                      key:
-                                        type: string
-                                      mode:
-                                        format: int32
-                                        type: integer
-                                      path:
-                                        type: string
-                                    required:
-                                    - key
-                                    - path
-                                    type: object
-                                  type: array
-                                optional:
-                                  type: boolean
-                                secretName:
-                                  type: string
-                              type: object
-                            storageos:
-                              properties:
-                                fsType:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                volumeName:
-                                  type: string
-                                volumeNamespace:
-                                  type: string
-                              type: object
-                            vsphereVolume:
-                              properties:
-                                fsType:
-                                  type: string
-                                storagePolicyID:
-                                  type: string
-                                storagePolicyName:
-                                  type: string
-                                volumePath:
-                                  type: string
-                              required:
-                              - volumePath
-                              type: object
-                          required:
-                          - name
-                          type: object
-                        type: array
+                        x-kubernetes-preserve-unknown-fields: true
                    required:
                    - containers
                    type: object
@ -3321,8 +2668,6 @@ spec:
                properties:
                  activeSelector:
                    type: string
-                  postPromotionAnalysisRun:
-                    type: string
                  postPromotionAnalysisRunStatus:
                    properties:
                      message:
@ -3335,8 +2680,6 @@ spec:
                    - name
                    - status
                    type: object
-                  prePromotionAnalysisRun:
-                    type: string
                  prePromotionAnalysisRunStatus:
                    properties:
                      message:
@ -3351,18 +2694,11 @@ spec:
                    type: object
                  previewSelector:
                    type: string
-                  previousActiveSelector:
-                    type: string
-                  scaleDownDelayStartTime:
-                    format: date-time
-                    type: string
                  scaleUpPreviewCheckPoint:
                    type: boolean
                type: object
              canary:
                properties:
-                  currentBackgroundAnalysisRun:
-                    type: string
                  currentBackgroundAnalysisRunStatus:
                    properties:
                      message:
@ -3377,8 +2713,6 @@ spec:
                    type: object
                  currentExperiment:
                    type: string
-                  currentStepAnalysisRun:
-                    type: string
                  currentStepAnalysisRunStatus:
                    properties:
                      message:
@ -3467,4 +2801,12 @@ spec:
        required:
        - spec
        type: object
+    served: true
+    storage: true
+    subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.replicas
+        statusReplicasPath: .status.HPAReplicas
+      status: {}
 {{- end }}
--- a/charts/argo-rollouts/values.yaml
+++ b/charts/argo-rollouts/values.yaml
@ -30,10 +30,13 @@ controller:
      additionalLabels: {}
      additionalAnnotations: {}

-
 serviceAccount:
  name: argo-rollouts

+## Annotations to be added to all CRDs
+##
+crdAnnotations: {}
+
 ## Annotations to be added to the Rollout pods
 ##
 podAnnotations: {}
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.12.5
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.16.6
+version: 0.16.8
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
--- a/charts/argo/templates/server-cluster-roles.yaml
+++ b/charts/argo/templates/server-cluster-roles.yaml
@ -75,6 +75,8 @@ rules:
  - events
  verbs:
  - watch
+  - create
+  - patch
 {{- if .Values.controller.persistence }}
 - apiGroups:
  - ""
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@ -53,7 +53,7 @@ data:
        endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio:9000") }}
        insecure: {{ .Values.artifactRepository.s3.insecure }}
        {{- if .Values.artifactRepository.s3.keyFormat }}
-        keyFormat: {{ .Values.artifactRepository.s3.keyFormat }}
+        keyFormat: {{ .Values.artifactRepository.s3.keyFormat | quote }}
        {{- end }}
        {{- if .Values.artifactRepository.s3.region }}
        region: {{ .Values.artifactRepository.s3.region }}
--- a/charts/argo/templates/workflow-controller-deployment.yaml
+++ b/charts/argo/templates/workflow-controller-deployment.yaml
@ -55,6 +55,9 @@ spec:
          - "--pod-workers"
          - {{ . | quote }}
          {{- end }}
+          {{- if .Values.controller.extraArgs }}
+          {{- toYaml .Values.controller.extraArgs | nindent 10 }}
+          {{- end }}
          env:
          - name: ARGO_NAMESPACE
            valueFrom:
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@ -118,6 +118,8 @@ controller:
  # The list of environment variable definitions to be added to the controller
  # manages container verbatim.
  extraEnv: []
+  # Extra arguments to be added to the controller
+  extraArgs: []
  replicas: 1
  pdb:
    enabled: false
--- a/charts/argocd-applicationset/.helmignore
+++ b/charts/argocd-applicationset/.helmignore
@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
--- a/charts/argocd-applicationset/Chart.yaml
+++ b/charts/argocd-applicationset/Chart.yaml
@ -0,0 +1,14 @@
+apiVersion: v2
+name: argocd-applicationset
+description: A Helm chart for installing ArgoCD ApplicationSet
+type: application
+version: 0.1.3
+appVersion: "v0.1.0"
+home: https://github.com/argoproj/argo-helm
+icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
+keywords:
+  - argoproj
+  - appset
+  - gitops
+maintainers:
+  - name: maruina
--- a/charts/argocd-applicationset/README.md
+++ b/charts/argocd-applicationset/README.md
@ -0,0 +1,75 @@
+# Argo CD ApplicationSet Chart
+
+A Helm chart for Argo CD ApplicationSet, a controller to programmatically generate Argo CD Application.
+
+Source code can be found [here](https://github.com/argoproj-labs/applicationset/)
+
+## Additional Information
+
+This is a **community maintained** chart. This chart installs the [applicationset](https://github.com/argoproj-labs/applicationset) controller.
+
+This chart currently installs the non-HA version of Argo CD ApplicationSet.
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+$ helm repo add argo https://argoproj.github.io/argo-helm
+"argo" has been added to your repositories
+
+$ helm install --name my-release argo/argocd-applicationset
+NAME: my-release
+...
+```
+
+### Helm v3 Compatibility
+
+Users of Helm v3 should set the `installCRDs` value to `false` to avoid warnings about nonexistent webhooks.
+
+### Testing
+
+Users can test the chart with [kind](https://kind.sigs.k8s.io/) and [ct](https://github.com/helm/chart-testing).
+
+```console
+kind create cluster
+kubectl create namespace argocd
+kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
+ct install --namespace argocd
+```
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) |
+| args.metricsAddr | int | `8080` | The default metric address |
+| args.probeBindAddr | int | `8081` | The default health check port |
+| args.enableLeaderElection | bool | `false` | The default leader election setting |
+| args.namespace | string | `argocd` | The default Argo CD repo namespace |
+| args.argocdRepoServer | string | `argocd-repo-server:8081` | The default Argo CD repo server address |
+| args.policy | string | `sync` | How application is synced between the generator and the cluster |
+| args.debug | bool | `false` | Print debug logs |
+| args.dryRun | bool | `false` | Enable dry run mode |
+| fullnameOverride | string | `""` | Override the default fully qualified app name |
+| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.repository | string | `"quay.io/argocdapplicationset/argocd-applicationset"` | If defined, a repository applied to the ApplicationSet deployment. |
+| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
+| imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository. |
+| installCRDs | bool | `true` | Install Custom Resource Definition |
+| mountSSHKnownHostsVolume | bool | `true` | Mount the `argocd-ssh-known-hosts-cm` volume |
+| mountTLSCertsVolume | bool | `true` | Mount the `argocd-tls-certs-cm` volume |
+| mountGPGKeysVolume | bool | `false` | Mount the `argocd-gpg-keys-cm` volume |
+| mountGPGKeyringVolume | bool | `true` | Mount an emptyDir volume for `gpg-keyring` |
+| nameOverride | string | `""` | Provide a name in place of `argocd-applicationset` |
+| nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) |
+| podAnnotations | object | `{}` | Annotations for the controller pods |
+| podSecurityContext | object | `{}` | Pod Security Context |
+| rbac.pspEnabled | bool | `true` | Enable Pod Security Policy |
+| replicaCount | int | `1` | The number of controller pods to run |
+| resources | object | `{}` | Resource limits and requests for the controller pods. |
+| securityContext | object | `{}` | Security Context |
+| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
+| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
+| 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 |
+| tolerations | list | `[]` | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) |
--- a/charts/argocd-applicationset/ci/default-values.yaml
+++ b/charts/argocd-applicationset/ci/default-values.yaml
@ -0,0 +1,77 @@
+# Default values for argo-applicationset.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+installCRDs: false # this needs to be false with ct
+
+image:
+  # The image repository
+  repository: quay.io/argocdapplicationset/argocd-applicationset
+  # Image pull policy
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+args:
+  metricsAddr: :8080
+  probeBindAddr: :8081
+  enableLeaderElection: false
+  namespace: argocd
+  argocdRepoServer: argocd-repo-server:8081
+  policy: sync
+  debug: false
+  dryRun: false
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # 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: ""
+
+podAnnotations: {}
+
+rbac:
+  pspEnabled: true
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+mountSSHKnownHostsVolume: true
+mountTLSCertsVolume: true
+mountGPGKeysVolume: false
+mountGPGKeyringVolume: true
--- a/charts/argocd-applicationset/ci/leader-election-values.yaml
+++ b/charts/argocd-applicationset/ci/leader-election-values.yaml
@ -0,0 +1,6 @@
+args:
+  enableLeaderElection: true
+
+replicaCount: 3
+
+installCRDs: false
--- a/charts/argocd-applicationset/crds/crd-applicationset.yaml
+++ b/charts/argocd-applicationset/crds/crd-applicationset.yaml
--- a/charts/argocd-applicationset/templates/_helpers.tpl
+++ b/charts/argocd-applicationset/templates/_helpers.tpl
@ -0,0 +1,65 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "argo-applicationset.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+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).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "argo-applicationset.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.
+*/}}
+{{- define "argo-applicationset.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "argo-applicationset.labels" -}}
+helm.sh/chart: {{ include "argo-applicationset.chart" . }}
+{{ include "argo-applicationset.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "argo-applicationset.name" . }}
+app.kubernetes.io/part-of: argo-cd-applicationset
+app.kubernetes.io/component: controller
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "argo-applicationset.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "argo-applicationset.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "argo-applicationset.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "argo-applicationset.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
--- a/charts/argocd-applicationset/templates/crds.yaml
+++ b/charts/argocd-applicationset/templates/crds.yaml
@ -0,0 +1,6 @@
+{{- if .Values.installCRDs }}
+{{- range $path, $_ := .Files.Glob "crds/*.yaml" }}
+{{ $.Files.Get $path }}
+---
+{{- end }}
+{{- end }}
--- a/charts/argocd-applicationset/templates/deployment.yaml
+++ b/charts/argocd-applicationset/templates/deployment.yaml
@ -0,0 +1,103 @@
+{{- $knownHosts := (lookup "v1" "ConfigMap" .Release.Namespace "argocd-ssh-known-hosts-cm") -}}
+{{- $tlsCerts := (lookup "v1" "ConfigMap" .Release.Namespace "argocd-tls-certs-cm") -}}
+{{- $gpgKeys:= (lookup "v1" "ConfigMap" .Release.Namespace "argocd-gpg-keys-cm") -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "argo-applicationset.fullname" . }}
+  labels:
+    {{- include "argo-applicationset.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "argo-applicationset.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "argo-applicationset.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "argo-applicationset.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          command:
+            - applicationset-controller
+            - --metrics-addr={{ .Values.args.metricsAddr }}
+            - --probe-addr={{ .Values.args.probeBindAddr }}
+            {{- if or (gt ( .Values.replicaCount | int64) 1) .Values.args.enableLeaderElection }}
+            - --enable-leader-election=true
+            {{- end }}
+            - --namespace={{ .Values.args.namespace }}
+            - --argocd-repo-server={{ .Values.args.argocdRepoServer }}
+            - --policy={{ .Values.args.policy }}
+            - --debug={{ .Values.args.debug }}
+            - --dry-run={{ .Values.args.dryRun }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ (split ":" .Values.args.probeBindAddr)._1 }}
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            {{- if and $knownHosts .Values.mountSSHKnownHostsVolume }}
+            - mountPath: /app/config/ssh
+              name: ssh-known-hosts
+            {{- end }}
+            {{- if and $tlsCerts .Values.mountTLSCertsVolume }}
+            - mountPath: /app/config/tls
+              name: tls-certs
+            {{- end }}
+            {{- if and $gpgKeys .Values.mountGPGKeysVolume }}
+            - mountPath: /app/config/gpg/source
+              name: gpg-keys
+            {{- end }}
+            {{- if .Values.mountGPGKeyringVolume }}
+            - mountPath: /app/config/gpg/keys
+              name: gpg-keyring
+            {{- end }}
+      volumes:
+      {{- if and $knownHosts .Values.mountSSHKnownHostsVolume }}
+      - configMap:
+          name: argocd-ssh-known-hosts-cm
+        name: ssh-known-hosts
+      {{- end }}
+      {{- if and $tlsCerts .Values.mountTLSCertsVolume }}
+      - configMap:
+          name: argocd-tls-certs-cm
+        name: tls-certs
+      {{- end }}
+      {{- if and $gpgKeys .Values.mountGPGKeysVolume }}
+      - configMap:
+          name: argocd-gpg-keys-cm
+        name: gpg-keys
+      {{- end }}
+      {{- if .Values.mountGPGKeyringVolume }}
+      - emptyDir: {}
+        name: gpg-keyring
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
--- a/charts/argocd-applicationset/templates/psp.yaml
+++ b/charts/argocd-applicationset/templates/psp.yaml
@ -0,0 +1,57 @@
+{{- if .Values.rbac.pspEnabled }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ template "argo-applicationset.fullname" . }}
+  labels:
+    {{- include "argo-applicationset.labels" . | nindent 4 }}
+  annotations:
+    seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*'
+spec:
+  privileged: false
+  hostIPC: false
+  hostNetwork: false
+  hostPID: false
+  readOnlyRootFilesystem: false
+  allowPrivilegeEscalation: false
+  allowedCapabilities:
+    - '*'
+  fsGroup:
+    rule: RunAsAny
+  runAsUser:
+    rule: RunAsAny
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  volumes:
+    - '*'
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ template "argo-applicationset.fullname" . }}-psp
+  labels:
+    {{- include "argo-applicationset.labels" . | nindent 4 }}
+rules:
+  - apiGroups: ['policy']
+    resources: ['podsecuritypolicies']
+    verbs:     ['use']
+    resourceNames:
+      - {{ template "argo-applicationset.fullname" . }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ template "argo-applicationset.fullname" . }}-psp
+  labels:
+    {{- include "argo-applicationset.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ template "argo-applicationset.fullname" . }}-psp
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "argo-applicationset.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
--- a/charts/argocd-applicationset/templates/rbac.yaml
+++ b/charts/argocd-applicationset/templates/rbac.yaml
@ -0,0 +1,97 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "argo-applicationset.fullname" . }}
+  labels:
+    {{- include "argo-applicationset.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+    - argoproj.io
+    resources:
+    - applications
+    - appprojects
+    - applicationsets
+    - applicationsets/finalizers
+    verbs:
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
+  - apiGroups:
+    - argoproj.io
+    resources:
+    - applicationsets/status
+    verbs:
+    - get
+    - patch
+    - update
+  - apiGroups:
+    - ""
+    resources:
+    - events
+    verbs:
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
+  - apiGroups:
+    - ""
+    resources:
+    - secrets
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+    - ""
+    resources:
+    - configmaps
+    verbs:
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
+  - apiGroups:
+    - apps
+    - extensions
+    resources:
+    - deployments
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+    - coordination.k8s.io
+    resources:
+    - leases
+    verbs:
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "argo-applicationset.fullname" . }}
+  labels:
+    {{- include "argo-applicationset.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "argo-applicationset.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "argo-applicationset.serviceAccountName" . }}
--- a/charts/argocd-applicationset/templates/serviceaccount.yaml
+++ b/charts/argocd-applicationset/templates/serviceaccount.yaml
@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "argo-applicationset.serviceAccountName" . }}
+  labels:
+    {{- include "argo-applicationset.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
--- a/charts/argocd-applicationset/values.yaml
+++ b/charts/argocd-applicationset/values.yaml
@ -0,0 +1,77 @@
+# Default values for argo-applicationset.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+installCRDs: true
+
+image:
+  # The image repository
+  repository: quay.io/argocdapplicationset/argocd-applicationset
+  # Image pull policy
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+args:
+  metricsAddr: :8080
+  probeBindAddr: :8081
+  enableLeaderElection: false
+  namespace: argocd
+  argocdRepoServer: argocd-repo-server:8081
+  policy: sync
+  debug: false
+  dryRun: false
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # 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: ""
+
+podAnnotations: {}
+
+rbac:
+  pspEnabled: true
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+mountSSHKnownHostsVolume: true
+mountTLSCertsVolume: true
+mountGPGKeysVolume: false
+mountGPGKeyringVolume: true
--- a/charts/argocd-notifications/Chart.yaml
+++ b/charts/argocd-notifications/Chart.yaml
@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 1.0.1
+appVersion: 1.1.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.0.14
+version: 1.1.1
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
--- a/charts/argocd-notifications/values.yaml
+++ b/charts/argocd-notifications/values.yaml
@ -7,7 +7,7 @@ fullnameOverride: ""

 image:
  repository: argoprojlabs/argocd-notifications
-  tag: v1.0.1
+  tag: v1.1.1
  pullPolicy: IfNotPresent

 imagePullSecrets: []
@ -337,7 +337,7 @@ bots:

    image:
      repository: argoprojlabs/argocd-notifications
-      tag: v1.0.1
+      tag: v1.1.1
      pullPolicy: IfNotPresent

    imagePullSecrets: []