From 384ffbc4cc8852e5b63b14cf1dec88837844c845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20M=C3=A5rdsj=C3=B6?= Date: Fri, 4 Mar 2022 13:43:22 +0100 Subject: [PATCH 1/2] Add extraEnvVars to helm chart --- chart/templates/deployment.yaml | 3 +++ chart/values.yaml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 0826639e..8167e1a3 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -52,6 +52,9 @@ spec: value: "{{ .Values.kafka.keystoreFile }}" - name: SERVER_PORT value: "{{ .Values.server.port }}" + {{- if .Values.extraEnvVars }} + {{- .Values.extraEnvVars | toYaml | nindent 10 }} + {{- end }} - name: CMD_ARGS {{- if .Values.mountProtoDesc.enabled }} value: "--message.format=PROTOBUF --protobufdesc.directory=/protodesc/ {{ .Values.cmdArgs }}" diff --git a/chart/values.yaml b/chart/values.yaml index ce23b933..ef0fc1ba 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,5 +1,10 @@ replicaCount: 1 +## extraEnvVars: +## - name: FOO +## value: "bar" +extraEnvVars: [] + image: repository: obsidiandynamics/kafdrop tag: latest From 6e16f99e57a0cfd972cd7c9c9699727c66abf5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20M=C3=A5rdsj=C3=B6?= Date: Fri, 4 Mar 2022 14:06:01 +0100 Subject: [PATCH 2/2] Only render helm value kafka.properties if specified --- chart/templates/deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 8167e1a3..69292fbf 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -30,8 +30,10 @@ spec: env: - name: KAFKA_BROKERCONNECT value: "{{ .Values.kafka.brokerConnect }}" + {{- if .Values.kafka.properties }} - name: KAFKA_PROPERTIES value: "{{ .Values.kafka.properties }}" + {{- end }} - name: KAFKA_TRUSTSTORE value: "{{ .Values.kafka.truststore }}" - name: KAFKA_KEYSTORE