Skip to content

Commit e06c7ed

Browse files
authored
Refer to the correct variable in discovery error message (#3296)
1 parent 9fba375 commit e06c7ed

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

charts/gha-runner-scale-set/templates/_helpers.tpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,13 +526,13 @@ volumeMounts:
526526
{{- end }}
527527
{{- end }}
528528
{{- if and (eq $multiNamespacesCounter 0) (eq $singleNamespaceCounter 0) }}
529-
{{- fail "No gha-rs-controller deployment found using label (app.kubernetes.io/part-of=gha-rs-controller). Consider setting controllerServiceAccount.name in values.yaml to be explicit if you think the discovery is wrong." }}
529+
{{- fail "No gha-rs-controller deployment found using label (app.kubernetes.io/part-of=gha-rs-controller). Consider setting controllerServiceAccount.namespace in values.yaml to be explicit if you think the discovery is wrong." }}
530530
{{- end }}
531531
{{- if and (gt $multiNamespacesCounter 0) (gt $singleNamespaceCounter 0) }}
532-
{{- fail "Found both gha-rs-controller installed with flags.watchSingleNamespace set and unset in cluster, this is not supported. Consider setting controllerServiceAccount.name in values.yaml to be explicit if you think the discovery is wrong." }}
532+
{{- fail "Found both gha-rs-controller installed with flags.watchSingleNamespace set and unset in cluster, this is not supported. Consider setting controllerServiceAccount.namespace in values.yaml to be explicit if you think the discovery is wrong." }}
533533
{{- end }}
534534
{{- if gt $multiNamespacesCounter 1 }}
535-
{{- fail "More than one gha-rs-controller deployment found using label (app.kubernetes.io/part-of=gha-rs-controller). Consider setting controllerServiceAccount.name in values.yaml to be explicit if you think the discovery is wrong." }}
535+
{{- fail "More than one gha-rs-controller deployment found using label (app.kubernetes.io/part-of=gha-rs-controller). Consider setting controllerServiceAccount.namespace in values.yaml to be explicit if you think the discovery is wrong." }}
536536
{{- end }}
537537
{{- if eq $multiNamespacesCounter 1 }}
538538
{{- with $controllerDeployment.metadata }}
@@ -545,11 +545,11 @@ volumeMounts:
545545
{{- $managerServiceAccountNamespace = (get $controllerDeployment.metadata.labels "actions.github.com/controller-service-account-namespace") }}
546546
{{- end }}
547547
{{- else }}
548-
{{- fail "No gha-rs-controller deployment that watch this namespace found using label (actions.github.com/controller-watch-single-namespace). Consider setting controllerServiceAccount.name in values.yaml to be explicit if you think the discovery is wrong." }}
548+
{{- fail "No gha-rs-controller deployment that watch this namespace found using label (actions.github.com/controller-watch-single-namespace). Consider setting controllerServiceAccount.namespace in values.yaml to be explicit if you think the discovery is wrong." }}
549549
{{- end }}
550550
{{- end }}
551551
{{- if eq $managerServiceAccountNamespace "" }}
552-
{{- fail "No service account namespace found for gha-rs-controller deployment using label (actions.github.com/controller-service-account-namespace), consider setting controllerServiceAccount.name in values.yaml to be explicit if you think the discovery is wrong." }}
552+
{{- fail "No service account namespace found for gha-rs-controller deployment using label (actions.github.com/controller-service-account-namespace), consider setting controllerServiceAccount.namespace in values.yaml to be explicit if you think the discovery is wrong." }}
553553
{{- end }}
554554
{{- $managerServiceAccountNamespace }}
555555
{{- end }}

0 commit comments

Comments
 (0)