From f8803d52d1485fa734efe72c04478be3069e1325 Mon Sep 17 00:00:00 2001 From: AJ Christensen Date: Thu, 17 Feb 2022 21:19:27 +1300 Subject: [PATCH] fix(argo-cd applicationset): add extraContainers to deployment (#1125) Signed-off-by: AJ Christensen Co-authored-by: Marco Kilchhofer --- charts/argocd-applicationset/Chart.yaml | 4 ++-- charts/argocd-applicationset/README.md | 1 + charts/argocd-applicationset/templates/deployment.yaml | 3 +++ charts/argocd-applicationset/values.yaml | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/charts/argocd-applicationset/Chart.yaml b/charts/argocd-applicationset/Chart.yaml index 69dfcf26..e44545a6 100644 --- a/charts/argocd-applicationset/Chart.yaml +++ b/charts/argocd-applicationset/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: argocd-applicationset description: A Helm chart for installing ArgoCD ApplicationSet type: application -version: 1.10.0 +version: 1.11.0 appVersion: "v0.3.0" home: https://github.com/argoproj/argo-helm icon: https://argocd-applicationset.readthedocs.io/en/stable/assets/logo.png @@ -14,4 +14,4 @@ maintainers: - name: maruina annotations: artifacthub.io/changes: | - - "[Added]: Ability to define custom env variables for ArgoCD applicationset" + - "[Added]: extraContainers support in Deployment resource" diff --git a/charts/argocd-applicationset/README.md b/charts/argocd-applicationset/README.md index f3637ac7..7a678f83 100644 --- a/charts/argocd-applicationset/README.md +++ b/charts/argocd-applicationset/README.md @@ -67,6 +67,7 @@ kubectl apply -k https://github.com/argoproj-labs/applicationset.git/manifests/c | args.policy | string | `"sync"` | How application is synced between the generator and the cluster | | args.probeBindAddr | string | `":8081"` | The default health check port | | extraArgs | list | `[]` | List of extra cli args to add | +| extraContainers | list | `[]` | Additional containers to be added to the applicationset controller pod | | extraEnv | list | `[]` | Environment variables to pass to the controller | | extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the controller | | extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) | diff --git a/charts/argocd-applicationset/templates/deployment.yaml b/charts/argocd-applicationset/templates/deployment.yaml index 9d39dfa8..468c21b6 100644 --- a/charts/argocd-applicationset/templates/deployment.yaml +++ b/charts/argocd-applicationset/templates/deployment.yaml @@ -91,6 +91,9 @@ spec: {{- with .Values.extraVolumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.extraContainers }} + {{- toYaml . | nindent 8 }} + {{- end }} volumes: - emptyDir: {} name: tmp-dir diff --git a/charts/argocd-applicationset/values.yaml b/charts/argocd-applicationset/values.yaml index 8ddcfee5..d51853e3 100644 --- a/charts/argocd-applicationset/values.yaml +++ b/charts/argocd-applicationset/values.yaml @@ -31,6 +31,9 @@ args: # -- Enable dry run mode dryRun: false +# -- Additional containers to be added to the applicationset controller pod +extraContainers: [] + ## Metrics service configuration metrics: # -- Deploy metrics service