From 5e18356d25f65f219894a3a092fc53fbcc516189 Mon Sep 17 00:00:00 2001 From: Brian Johnson Date: Tue, 9 Nov 2021 12:49:48 -0800 Subject: [PATCH] feat(argo-rollouts): Allow additional containers in controller deployment (#999) * feat: Allow additional containers in controller deployment Our local metrics setup uses an extra container for the controller deployment. Adding this in case others have a similar use case. Signed-off-by: Brian Johnson * Apply suggesstions from code review Signed-off-by: Brian Johnson * Bump minor version Signed-off-by: Marco Kilchhofer Co-authored-by: Marco Kilchhofer --- charts/argo-rollouts/Chart.yaml | 4 ++-- charts/argo-rollouts/README.md | 1 + charts/argo-rollouts/templates/controller/deployment.yaml | 3 +++ charts/argo-rollouts/values.yaml | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index f8b50237..6a0841b3 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "v1.1.0" description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 2.3.0 +version: 2.4.0 icon: https://argoproj.github.io/argo-rollouts/assets/logo.png home: https://github.com/argoproj/argo-helm maintainers: @@ -11,4 +11,4 @@ maintainers: - name: jessesuen annotations: artifacthub.io/changes: | - - "[Added]: Support for extraArgs for controller and dashboard" + - "[Added]: Support for extraContainers for controller deployment" diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md index b13884ef..624cc2a6 100644 --- a/charts/argo-rollouts/README.md +++ b/charts/argo-rollouts/README.md @@ -39,6 +39,7 @@ If dashboard is installed by `--set dashboard.enabled=true`, checkout the argo-r | controller.image.repository | string | `"argoproj/argo-rollouts"` | Repository to use | | controller.image.tag | string | `""` | Overrides the image tag (default is the chart appVersion) | | controller.extraArgs | list | `[]` | Additional arguments for the controller. A list of flags. | +| controller.extraContainers | list | `[]` | Literal yaml for extra containers to be added to controller deployment. | | controller.resources | object | `{}` | Resource limits and requests for the controller pods. | | controller.tolerations | list | `[]` | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | | controller.affinity | object | `{}` | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) | diff --git a/charts/argo-rollouts/templates/controller/deployment.yaml b/charts/argo-rollouts/templates/controller/deployment.yaml index 9672d119..fc359d42 100644 --- a/charts/argo-rollouts/templates/controller/deployment.yaml +++ b/charts/argo-rollouts/templates/controller/deployment.yaml @@ -52,6 +52,9 @@ spec: {{- toYaml .Values.containerSecurityContext | nindent 10 }} resources: {{- toYaml .Values.controller.resources | nindent 10 }} + {{- with .Values.controller.extraContainers }} + {{- toYaml . | nindent 6 }} + {{- end }} {{- if .Values.controller.nodeSelector }} nodeSelector: {{- toYaml .Values.controller.nodeSelector | nindent 8 }} diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml index c009bbd4..caef4d0d 100644 --- a/charts/argo-rollouts/values.yaml +++ b/charts/argo-rollouts/values.yaml @@ -21,6 +21,10 @@ controller: ## extraArgs: [] + ## Additional containers to add to the rollouts controller deployment + ## This will be rendered as the literal yaml + extraContainers: [] + resources: {} # limits: # cpu: 100m