allow insecureSkipTlsVerify with certificates

danielqsj · Apr 2, 2024 · 9fa0959 · 9fa0959
1 parent 2e60c05
commit 9fa0959
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 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.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
@@ -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
@@ -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: