From 258ad7fa648c98d1165321129662940fba5ff52f Mon Sep 17 00:00:00 2001 From: sgavrylenko <13081190+sgavrylenko@users.noreply.github.com> Date: Thu, 16 Sep 2021 21:59:39 +0300 Subject: [PATCH] feat(argocd-image-updater): Add custom environment variables (#874) * feat(argocd-notifications): Add example for defaultTriggers (#871) * extending chart by optional defaultTriggers Signed-off-by: shortsn * #871 adjustments according review comments Signed-off-by: shortsn * #871 rework using existing field Signed-off-by: shortsn * #871 fixing linebreaks Signed-off-by: shortsn * #871 adjusting version Signed-off-by: shortsn Signed-off-by: Sergiy Gavrylenko * feat(argocd-image-updater): Add custom environment variable Signed-off-by: Sergiy Gavrylenko * feat(argocd-image-updater): Add custom environment variables Signed-off-by: Sergiy Gavrylenko * Revert "feat(argocd-image-updater): Add custom environment variable" This reverts commit c6146d942c97dc694aa7777ec73d649afba1b4ab. Signed-off-by: Sergiy Gavrylenko * feat(argocd-image-updater): Add custom environment variables into deployment Signed-off-by: Sergiy Gavrylenko * chore: Rework PR Signed-off-by: Marco Kilchhofer Co-authored-by: shortsn Co-authored-by: Sergiy Gavrylenko Co-authored-by: Marco Kilchhofer Co-authored-by: Marko Bevc --- charts/argocd-image-updater/Chart.yaml | 4 ++-- charts/argocd-image-updater/README.md | 1 + charts/argocd-image-updater/templates/deployment.yaml | 3 +++ charts/argocd-image-updater/values.yaml | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/charts/argocd-image-updater/Chart.yaml b/charts/argocd-image-updater/Chart.yaml index aecbdb89..bf652d50 100644 --- a/charts/argocd-image-updater/Chart.yaml +++ b/charts/argocd-image-updater/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: argocd-image-updater description: A Helm chart for Argo CD Image Updater, a tool to automatically update the container images of Kubernetes workloads which are managed by Argo CD type: application -version: 0.1.1 +version: 0.2.0 appVersion: v0.10.1 home: https://github.com/argoproj-labs/argocd-image-updater icon: https://argocd-image-updater.readthedocs.io/en/stable/assets/logo.png @@ -15,4 +15,4 @@ maintainers: url: https://argoproj.github.io/ annotations: artifacthub.io/changes: | - - "[Fixed]: Add scratch space (emptyDir) for /tmp" + - "[Added]: Ability to provide custom environment variables" diff --git a/charts/argocd-image-updater/README.md b/charts/argocd-image-updater/README.md index d3440dd6..a3c97ced 100644 --- a/charts/argocd-image-updater/README.md +++ b/charts/argocd-image-updater/README.md @@ -67,6 +67,7 @@ The `config.registries` value can be used exactly as it looks in the documentati | config.logLevel | string | `"info"` | ArgoCD Image Update log level | | config.registries | list | `[]` | ArgoCD Image Updater registries list configuration. More information [here](https://argocd-image-updater.readthedocs.io/en/stable/configuration/registries/) | | extraArgs | list | `[]` | Extra arguments for argocd-image-updater not defined in config.argocd | +| extraEnv | list | `[]` | Extra environment variables for argocd-image-updater | | fullnameOverride | string | `""` | Global fullname (argocd-image-updater.fullname in _helpers.tpl) override | | image.pullPolicy | string | `"Always"` | Default image pull policy | | image.repository | string | `"argoprojlabs/argocd-image-updater"` | Default image repository | diff --git a/charts/argocd-image-updater/templates/deployment.yaml b/charts/argocd-image-updater/templates/deployment.yaml index 515de34b..d19ecf4e 100644 --- a/charts/argocd-image-updater/templates/deployment.yaml +++ b/charts/argocd-image-updater/templates/deployment.yaml @@ -51,6 +51,9 @@ spec: optional: true - name: IMAGE_UPDATER_LOGLEVEL value: {{ .Values.config.logLevel }} + {{- with .Values.extraEnv }} + {{- toYaml . | nindent 10 }} + {{- end }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" diff --git a/charts/argocd-image-updater/values.yaml b/charts/argocd-image-updater/values.yaml index f939137c..c6bbf4d4 100644 --- a/charts/argocd-image-updater/values.yaml +++ b/charts/argocd-image-updater/values.yaml @@ -27,6 +27,11 @@ extraArgs: [] # - --once # - --registries-conf-path /app/config/registries.conf +# -- Extra environment variables for argocd-image-updater +extraEnv: [] + # - name: AWS_REGION + # value: "us-west-1" + config: # Described in detail here https://argocd-image-updater.readthedocs.io/en/stable/install/running/#flags argocd: