[nats helm] set probe scheme based on monitor tls (#806)

Signed-off-by: Caleb Lloyd <[email protected]>
nats-io · Oct 2, 2023 · 7fb4b2c · 7fb4b2c
1 parent df9671e
commit 7fb4b2c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/helm/charts/nats/files/stateful-set/nats-container.yaml b/helm/charts/nats/files/stateful-set/nats-container.yaml
@@ -33,11 +33,15 @@ lifecycle:
       - nats-server
       - -sl=ldm=/var/run/nats/nats.pid
 
-{{- if .Values.config.monitor.enabled }}
+{{- with .Values.config.monitor }}
+{{- if .enabled }}
 startupProbe:
   httpGet:
     path: /healthz
     port: monitor
+    {{- if .tls.enabled }}
+    scheme: HTTPS
+    {{- end}}
   initialDelaySeconds: 10
   timeoutSeconds: 5
   periodSeconds: 10
@@ -47,6 +51,9 @@ readinessProbe:
   httpGet:
     path: /healthz?js-server-only=true
     port: monitor
+    {{- if .tls.enabled }}
+    scheme: HTTPS
+    {{- end}}
   initialDelaySeconds: 10
   timeoutSeconds: 5
   periodSeconds: 10
@@ -56,12 +63,16 @@ livenessProbe:
   httpGet:
     path: /healthz?js-enabled-only=true
     port: monitor
+    {{- if .tls.enabled }}
+    scheme: HTTPS
+    {{- end}}
   initialDelaySeconds: 10
   timeoutSeconds: 5
   periodSeconds: 30
   successThreshold: 1
   failureThreshold: 3
 {{- end }}
+{{- end }}
 
 volumeMounts:
 # nats config

diff --git a/helm/charts/nats/test/tls_test.go b/helm/charts/nats/test/tls_test.go
@@ -1,9 +1,10 @@
 package test
 
 import (
+	"testing"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"testing"
 )
 
 func TestConfigTls(t *testing.T) {
@@ -117,6 +118,10 @@ config:
 		})
 	}
 
+	expected.StatefulSet.Value.Spec.Template.Spec.Containers[0].StartupProbe.HTTPGet.Scheme = corev1.URISchemeHTTPS
+	expected.StatefulSet.Value.Spec.Template.Spec.Containers[0].ReadinessProbe.HTTPGet.Scheme = corev1.URISchemeHTTPS
+	expected.StatefulSet.Value.Spec.Template.Spec.Containers[0].LivenessProbe.HTTPGet.Scheme = corev1.URISchemeHTTPS
+
 	expected.StatefulSet.Value.Spec.Template.Spec.Volumes = volumes
 	expected.StatefulSet.Value.Spec.Template.Spec.Containers[0].VolumeMounts = natsVm
 	expected.StatefulSet.Value.Spec.Template.Spec.Containers[1].VolumeMounts = reloaderVm