fix(helm/provisioner): fail if psk and key are both set (#15157)

johnstcn · defelmnq · commit 63fb66ae03a1 · 2024-10-23T15:36:38.000Z
Relates to #14985 Context: #15122 (comment) Specifying both `provisionerDaemon.pskSecretName` and `provisionerDaemon.keySecretName` will now result in an error. This prevents a potential `CrashLoopBackoff` debug session due to the following error: ``` error: cannot provide both provisioner key --key and pre-shared key --psk ```
diff --git a/helm/provisioner/templates/_coder.tpl b/helm/provisioner/templates/_coder.tpl
@@ -34,6 +34,8 @@ env:
   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." }}
+{{- else if and (.Values.provisionerDaemon.pskSecretName) (.Values.provisionerDaemon.keySecretName) }}
+{{ fail "Either provisionerDaemon.pskSecretName or provisionerDaemon.keySecretName must be specified, but not both." }}
 {{- end }}
 {{- if .Values.provisionerDaemon.pskSecretName }}
 - name: CODER_PROVISIONER_DAEMON_PSK
diff --git a/helm/provisioner/tests/chart_test.go b/helm/provisioner/tests/chart_test.go
@@ -58,7 +58,7 @@ var testCases = []testCase{
 	},
 	{
 		name:          "provisionerd_psk_and_key",
-		expectedError: "",
+		expectedError: `Either provisionerDaemon.pskSecretName or provisionerDaemon.keySecretName must be specified, but not both.`,
 	},
 	{
 		name:          "provisionerd_no_psk_or_key",
diff --git a/helm/provisioner/tests/testdata/provisionerd_psk_and_key.golden b/helm/provisioner/tests/testdata/provisionerd_psk_and_key.golden

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ var testCases = []testCase{`
`58`	`58`	`},`
`59`	`59`	`{`
`60`	`60`	`name: "provisionerd_psk_and_key",`
`61`		`- expectedError: "",`
	`61`	+ expectedError: `Either provisionerDaemon.pskSecretName or provisionerDaemon.keySecretName must be specified, but not both.`,
`62`	`62`	`},`
`63`	`63`	`{`
`64`	`64`	`name: "provisionerd_no_psk_or_key",`