require either provisioner key or psk to be set

johnstcn · johnstcn · commit c9936e0a3067 · 2024-10-17T12:22:53.000+01:00
diff --git a/helm/provisioner/templates/_coder.tpl b/helm/provisioner/templates/_coder.tpl
@@ -32,6 +32,9 @@ args:
 env:
 - name: CODER_PROMETHEUS_ADDRESS
   value: "0.0.0.0:2112"
+{{- if and (empty .Values.provisionerDaemon.pskSecretName) (empty .Values.provisionerDaemon.keySecretName) }}
+{{ fail "Either provisionerDaemon.pskSecretName or provisionerDaemon.keySecretName must be specified." }}
+{{- end }}
 {{- if .Values.provisionerDaemon.pskSecretName }}
 - name: CODER_PROVISIONER_DAEMON_PSK
   valueFrom:
diff --git a/helm/provisioner/tests/chart_test.go b/helm/provisioner/tests/chart_test.go
@@ -60,6 +60,10 @@ var testCases = []testCase{
 		name:          "provisionerd_psk_and_key",
 		expectedError: "",
 	},
+	{
+		name:          "provisionerd_no_psk_or_key",
+		expectedError: `Either provisionerDaemon.pskSecretName or provisionerDaemon.keySecretName must be specified.`,
+	},
 	{
 		name:          "extra_templates",
 		expectedError: "",
diff --git a/helm/provisioner/tests/testdata/provisionerd_no_psk_or_key.yaml b/helm/provisioner/tests/testdata/provisionerd_no_psk_or_key.yaml
@@ -0,0 +1,9 @@
+coder:
+  image:
+    tag: latest
+provisionerDaemon:
+  pskSecretName: ""
+  keySecretName: ""
+  tags:
+    location: auh
+    clusterType: k8s
