From c4ddc97e6276cb89451cd7cc52cdb013c8d59482 Mon Sep 17 00:00:00 2001
From: Andrej van der Zee <andrejvanderzee@gmail.com>
Date: Tue, 6 Feb 2024 10:16:55 +0100
Subject: [PATCH] Fix namespaced Role and non-namespaces ClusterRoleBindig in
 helm chart

---
 .../templates/manager_role_binding_secrets.yaml              | 2 ++
 .../templates/manager_role_secrets.yaml                      | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/actions-runner-controller/templates/manager_role_binding_secrets.yaml b/charts/actions-runner-controller/templates/manager_role_binding_secrets.yaml
index 9b7132cf..edfb8b49 100644
--- a/charts/actions-runner-controller/templates/manager_role_binding_secrets.yaml
+++ b/charts/actions-runner-controller/templates/manager_role_binding_secrets.yaml
@@ -6,7 +6,9 @@ kind: ClusterRoleBinding
 {{- end }}
 metadata:
   name: {{ include "actions-runner-controller.managerRoleName" . }}-secrets
+  {{- if .Values.scope.singleNamespace }}
   namespace: {{ .Release.Namespace }}
+  {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   {{- if .Values.scope.singleNamespace }}
diff --git a/charts/actions-runner-controller/templates/manager_role_secrets.yaml b/charts/actions-runner-controller/templates/manager_role_secrets.yaml
index 38037c83..d0a6edf2 100644
--- a/charts/actions-runner-controller/templates/manager_role_secrets.yaml
+++ b/charts/actions-runner-controller/templates/manager_role_secrets.yaml
@@ -7,6 +7,9 @@ kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: {{ include "actions-runner-controller.managerRoleName" . }}-secrets
+  {{- if .Values.scope.singleNamespace }}
+  namespace: {{ .Release.Namespace }}
+  {{- end }}
 rules:
 - apiGroups:
   - ""
@@ -21,4 +24,4 @@ rules:
 {{/* See https://github.com/actions/actions-runner-controller/pull/1268/files#r917331632 */}}
   - create
   - delete
-{{- end }}
\ No newline at end of file
+{{- end }}