From 9fa0959768fe82a6b67dbaea120a48e1511ef546 Mon Sep 17 00:00:00 2001
From: iFission <alexwwj@icloud.com>
Date: Tue, 2 Apr 2024 17:53:49 +0800
Subject: [PATCH] allow insecureSkipTlsVerify with certificates

---
 charts/kafka-exporter/Chart.yaml                | 2 +-
 charts/kafka-exporter/templates/deployment.yaml | 8 +++-----
 charts/kafka-exporter/templates/secret.yaml     | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/charts/kafka-exporter/Chart.yaml b/charts/kafka-exporter/Chart.yaml
index 518d8d0d..93a6c944 100644
--- 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.2.0
+version: 1.3.0
 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
index e2449a2d..61f79159 100644
--- a/charts/kafka-exporter/templates/deployment.yaml
+++ b/charts/kafka-exporter/templates/deployment.yaml
@@ -66,12 +66,11 @@ spec:
             - --tls.enabled
             {{- if .Values.kafkaExporter.tls.insecureSkipTlsVerify}}
             - --tls.insecure-skip-tls-verify
-            {{- else }}
+            {{- end }}
             - --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 }}
             - --verbosity={{ .Values.kafkaExporter.log.verbosity }}
             {{- end }}
@@ -102,8 +101,7 @@ spec:
             periodSeconds: 15
             successThreshold: 1
             timeoutSeconds: 9
-
-          {{- if and .Values.kafkaExporter.tls.enabled (not .Values.kafkaExporter.tls.insecureSkipTlsVerify) }}
+          {{- if .Values.kafkaExporter.tls.enabled }}
           volumeMounts:
           - name: tls-certs
             mountPath: "/etc/tls-certs/"
@@ -124,7 +122,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-    {{- if and .Values.kafkaExporter.tls.enabled (not .Values.kafkaExporter.tls.insecureSkipTlsVerify) }}
+    {{- if .Values.kafkaExporter.tls.enabled }}
       volumes:
       - name: tls-certs
         secret:
diff --git a/charts/kafka-exporter/templates/secret.yaml b/charts/kafka-exporter/templates/secret.yaml
index 48a6e851..e2249e89 100644
--- a/charts/kafka-exporter/templates/secret.yaml
+++ b/charts/kafka-exporter/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.kafkaExporter.tls.enabled (not .Values.kafkaExporter.tls.insecureSkipTlsVerify) }}
+{{- if .Values.kafkaExporter.tls.enabled }}
 apiVersion: v1
 kind: Secret
 metadata: