charts/kafka-exporter: move secrets to Secrets

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.5 / 2020-10-30
+
+* cmd/kafka_exporter: allow setting secrets using envs
+* charts/kafka-exporter: move secrets to Secrets
+
 # 0.1.4 / 2020-10-29
 
 * metrics: add kafka_broker_info

charts/kafka-exporter/Chart.yaml

@@ -20,4 +20,4 @@ version: 0.1.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v0.1.3
+appVersion: v0.1.5

charts/kafka-exporter/templates/deployment.yaml

@@ -37,18 +37,23 @@ spec:
             {{- if .Values.kafkaExporter.address }}
             - "--broker={{ .Values.kafkaExporter.broker }}"
             {{- end }}
-            {{- if .Values.kafkaExporter.saslUsername }}
-            - "--sasl.username={{ .Values.kafkaExporter.saslUsername }}"
-            {{- end }}
-            {{- if .Values.kafkaExporter.saslPassword }}
-            - "--sasl.password={{ .Values.kafkaExporter.saslPassword }}"
-            {{- end }}
             {{- if .Values.kafkaExporter.mechanisms }}
             - "--sasl.mechanisms={{ .Values.kafkaExporter.mechanisms }}"
             {{- end }}
             {{- if .Values.kafkaExporter.tls }}
             - "--tls"
             {{- end }}
+          env:
+            - name: KAFKA_SASL_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "kafka_exporter.fullname" . }}-{{ .Release.Revision }}
+                  key: saslUsername
+            - name: KAFKA_SASL_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "kafka_exporter.fullname" . }}-{{ .Release.Revision }}
+                  key: saslPassword
           ports:
             - name: http
               containerPort: 8080

charts/kafka-exporter/templates/secrets.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "kafka_exporter.fullname" . }}-{{ .Release.Revision }}
+  labels:
+  {{- include "kafka_exporter.labels" . | nindent 4 }}
+type: Opaque
+data:
+  saslUsername: {{ .Values.kafkaExporter.saslUsername | b64enc | quote }}
+  saslPassword: {{ .Values.kafkaExporter.saslPassword | b64enc | quote }}