From 2e33b99c6bd5b512ffce5e527e46988afd4f1180 Mon Sep 17 00:00:00 2001
From: Brien Dieterle <briend@terascope.io>
Date: Mon, 24 Oct 2022 08:46:41 -0700
Subject: [PATCH] helm: move Prometheus TLSConfig to job spec (#15739)

---
 helm/minio/templates/servicemonitor.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/helm/minio/templates/servicemonitor.yaml b/helm/minio/templates/servicemonitor.yaml
index fe14b1fba..955273b52 100644
--- a/helm/minio/templates/servicemonitor.yaml
+++ b/helm/minio/templates/servicemonitor.yaml
@@ -80,17 +80,19 @@ metadata:
     {{- end }}
 spec:
   jobName: {{ template "minio.fullname" . }}
+  {{- if .Values.tls.enabled }}
+  tlsConfig:
+    ca:
+      secret:
+        name: {{ .Values.tls.certSecret }}
+        key: {{ .Values.tls.publicCrt }}
+    serverName: {{ template "minio.fullname" . }}
+  {{- end }}
   prober:
     url: {{ template "minio.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.port }}
     path: /minio/v2/metrics/cluster
     {{- if .Values.tls.enabled }}
     scheme: https
-    tlsConfig:
-      ca:
-        secret:
-          name: {{ .Values.tls.certSecret }}
-          key: {{ .Values.tls.publicCrt }}
-      serverName: {{ template "minio.fullname" . }}
     {{ else }}
     scheme: http
     {{- end }}