Allow to skip certificate verification when tls is enabled

Signed-off-by: Marco Amador <amador.marco@gmail.com>
danielqsj · Jul 24, 2021 · 47859bd · 47859bd
1 parent e135244
commit 47859bd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/charts/kafka-exporter/Chart.yaml b/charts/kafka-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: kafka-exporter
-version: 1.1.0
+version: 1.1.1
 home: https://github.com/abhishekjiitr/kafka-exporter-helm
 maintainers:
   - name: abhishekjiitr

diff --git a/charts/kafka-exporter/templates/deployment.yaml b/charts/kafka-exporter/templates/deployment.yaml
@@ -49,10 +49,14 @@ spec:
             {{- end }}
             {{- if .Values.kafkaExporter.tls.enabled}}
             - --tls.enabled
+            {{- if .Values.kafkaExporter.tls.insecureSkipTlsVerify}}
+            - --tls.insecure-skip-tls-verify
+            {{- else }}
             - --tls.ca-file=/etc/tls-certs/ca-file
             - --tls.cert-file=/etc/tls-certs/cert-file
             - --tls.key-file=/etc/tls-certs/key-file
             {{- end }}
+            {{- end }}
             {{- if .Values.kafkaExporter.log }}
             - --log.level={{ .Values.kafkaExporter.log.level }}
             {{- if .Values.kafkaExporter.log.enableSarama }}
@@ -84,7 +88,7 @@ spec:
             successThreshold: 1
             timeoutSeconds: 9
 
-          {{- if .Values.kafkaExporter.tls.enabled }}
+          {{- if and .Values.kafkaExporter.tls.enabled (not .Values.kafkaExporter.tls.insecureSkipTlsVerify) }}
           volumeMounts:
           - name: tls-certs
             mountPath: "/etc/tls-certs/"
@@ -105,7 +109,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-    {{- if .Values.kafkaExporter.tls.enabled }}
+    {{- if and .Values.kafkaExporter.tls.enabled (not .Values.kafkaExporter.tls.insecureSkipTlsVerify) }}
       volumes:
       - name: tls-certs
         secret:

diff --git a/charts/kafka-exporter/templates/secret.yaml b/charts/kafka-exporter/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.kafkaExporter.tls.enabled }}
+{{- if and .Values.kafkaExporter.tls.enabled (not .Values.kafkaExporter.tls.insecureSkipTlsVerify) }}
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/charts/kafka-exporter/templates/servicemonitor.yaml b/charts/kafka-exporter/templates/servicemonitor.yaml
@@ -32,4 +32,8 @@ spec:
     {{- if .Values.prometheus.serviceMonitor.scrapeTimeout }}
     scrapeTimeout: {{ .Values.prometheus.serviceMonitor.scrapeTimeout }}
     {{- end }}
-{{- end }}
+    {{- if .Values.prometheus.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+    {{- toYaml .Values.prometheus.serviceMonitor.metricRelabelings | nindent 4 }}
+  {{- end }}
+  {{- end }}
diff --git a/charts/kafka-exporter/values.yaml b/charts/kafka-exporter/values.yaml
@@ -31,7 +31,7 @@ kafkaExporter:
 
   tls:
     enabled: false
-    insecure-skip-tls-verify: false
+    insecureSkipTlsVerify: false
     caFile: ""
     certFile: ""
     keyFile: ""
@@ -47,6 +47,7 @@ prometheus:
     interval: "30s"
     additionalLabels:
       app: kafka-exporter
+    metricRelabelings: {}
 
 labels: {}
 podLabels: {}