From b862c6239fa9a6df2f67cdd6a8162001fda42b79 Mon Sep 17 00:00:00 2001 From: Calum MacRae Date: Sat, 7 Aug 2021 23:43:28 +0100 Subject: [PATCH] feat(argo-events): Ability to specify custom env variables (#516) * feat(argo-events): Add debugLogging value for controller components Signed-off-by: Calum MacRae * fix: quote strings Signed-off-by: Marco Kilchhofer * Rework to generic extraEnv Signed-off-by: Marco Kilchhofer * Fix chart icon url Signed-off-by: Marco Kilchhofer Co-authored-by: Marco Kilchhofer --- charts/argo-events/Chart.yaml | 7 ++++--- .../templates/eventbus-controller-deployment.yaml | 3 +++ .../templates/eventsource-controller-deployment.yaml | 3 +++ .../templates/sensor-controller-deployment.yaml | 3 +++ charts/argo-events/values.yaml | 9 +++++++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index 835705bf..c29777c7 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 1.6.4 +version: 1.7.0 keywords: - argo-events - sensor-controller @@ -13,8 +13,9 @@ maintainers: - name: VaibhavPage - name: whynowy appVersion: 1.3.1 -icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png +icon: https://argoproj.github.io/argo-events/assets/logo.png home: https://github.com/argoproj/argo-helm annotations: artifacthub.io/changes: | - - "[Added]: Initialize Changelog" + - "[Added]: Ability to specify additional/custom environment variables" + - "[Fixed]: Charts icon url" diff --git a/charts/argo-events/templates/eventbus-controller-deployment.yaml b/charts/argo-events/templates/eventbus-controller-deployment.yaml index 591d8da3..747bfc11 100644 --- a/charts/argo-events/templates/eventbus-controller-deployment.yaml +++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml @@ -36,6 +36,9 @@ spec: - --namespaced {{- end }} env: + {{- with .Values.eventbusController.extraEnv }} + {{- toYaml . | nindent 12 }} + {{- end }} - name: NAMESPACE valueFrom: fieldRef: diff --git a/charts/argo-events/templates/eventsource-controller-deployment.yaml b/charts/argo-events/templates/eventsource-controller-deployment.yaml index 62fe150e..651ff39b 100644 --- a/charts/argo-events/templates/eventsource-controller-deployment.yaml +++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml @@ -36,6 +36,9 @@ spec: - --namespaced {{- end }} env: + {{- with .Values.eventsourceController.extraEnv }} + {{- toYaml . | nindent 12 }} + {{- end }} - name: NAMESPACE valueFrom: fieldRef: diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml index 0b51d1de..6c2f6a04 100644 --- a/charts/argo-events/templates/sensor-controller-deployment.yaml +++ b/charts/argo-events/templates/sensor-controller-deployment.yaml @@ -36,6 +36,9 @@ spec: - --namespaced {{- end }} env: + {{- with .Values.sensorController.extraEnv }} + {{- toYaml . | nindent 12 }} + {{- end }} - name: NAMESPACE valueFrom: fieldRef: diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index 11827406..db6f679d 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -47,6 +47,9 @@ sensorController: image: argoproj/sensor-controller tag: v1.3.1 replicaCount: 1 + extraEnv: [] + # - name: DEBUG_LOG + # value: "true" sensorImage: argoproj/sensor podAnnotations: {} nodeSelector: {} @@ -61,6 +64,9 @@ eventsourceController: image: argoproj/eventsource-controller tag: v1.3.1 replicaCount: 1 + extraEnv: [] + # - name: DEBUG_LOG + # value: "true" eventsourceImage: argoproj/eventsource podAnnotations: {} nodeSelector: {} @@ -75,6 +81,9 @@ eventbusController: image: argoproj/eventbus-controller tag: v1.3.1 replicaCount: 1 + extraEnv: [] + # - name: DEBUG_LOG + # value: "true" podAnnotations: {} nodeSelector: {} podLabels: {}