From c08b08a5f1cfdadb6879b5698eeec50e224c9be3 Mon Sep 17 00:00:00 2001 From: Nikola Jokic Date: Fri, 3 Oct 2025 14:02:43 +0200 Subject: [PATCH] fix template for others --- charts/gha-runner-scale-set/templates/manager_role.yaml | 9 ++++++++- .../templates/manager_role_binding.yaml | 9 ++++++++- .../templates/no_permission_serviceaccount.yaml | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/charts/gha-runner-scale-set/templates/manager_role.yaml b/charts/gha-runner-scale-set/templates/manager_role.yaml index 8696efa1..bbf92799 100644 --- a/charts/gha-runner-scale-set/templates/manager_role.yaml +++ b/charts/gha-runner-scale-set/templates/manager_role.yaml @@ -5,8 +5,15 @@ metadata: name: {{ include "gha-runner-scale-set.managerRoleName" . }} namespace: {{ include "gha-runner-scale-set.namespace" . }} labels: + {{- $base := include "gha-runner-scale-set.labels" . | fromYaml }} + {{- $extra := dict "app.kubernetes.io/component" "manager-role" }} + {{- $reserved := merge $base $extra }} {{- with .Values.labels }} - {{- toYaml . | nindent 4 }} + {{- range $k, $v := . }} + {{- if not (or (hasKey $reserved $k) (hasPrefix "actions.github.com/" $k)) }} + {{ $k }}: {{ $v | quote }} + {{- end }} + {{- end }} {{- end }} {{- if $hasCustomResourceMeta }} {{- with .Values.resourceMeta.managerRole.labels }} diff --git a/charts/gha-runner-scale-set/templates/manager_role_binding.yaml b/charts/gha-runner-scale-set/templates/manager_role_binding.yaml index 6da367b6..108af61c 100644 --- a/charts/gha-runner-scale-set/templates/manager_role_binding.yaml +++ b/charts/gha-runner-scale-set/templates/manager_role_binding.yaml @@ -5,8 +5,15 @@ metadata: name: {{ include "gha-runner-scale-set.managerRoleBindingName" . }} namespace: {{ include "gha-runner-scale-set.namespace" . }} labels: + {{- $base := include "gha-runner-scale-set.labels" . | fromYaml }} + {{- $extra := dict "app.kubernetes.io/component" "manager-role-binding" }} + {{- $reserved := merge $base $extra }} {{- with .Values.labels }} - {{- toYaml . | nindent 4 }} + {{- range $k, $v := . }} + {{- if not (or (hasKey $reserved $k) (hasPrefix "actions.github.com/" $k)) }} + {{ $k }}: {{ $v | quote }} + {{- end }} + {{- end }} {{- end }} {{- if $hasCustomResourceMeta }} {{- with .Values.resourceMeta.managerRoleBinding.labels }} diff --git a/charts/gha-runner-scale-set/templates/no_permission_serviceaccount.yaml b/charts/gha-runner-scale-set/templates/no_permission_serviceaccount.yaml index edb20d67..3095638d 100644 --- a/charts/gha-runner-scale-set/templates/no_permission_serviceaccount.yaml +++ b/charts/gha-runner-scale-set/templates/no_permission_serviceaccount.yaml @@ -7,8 +7,15 @@ metadata: name: {{ include "gha-runner-scale-set.noPermissionServiceAccountName" . }} namespace: {{ include "gha-runner-scale-set.namespace" . }} labels: + {{- $base := include "gha-runner-scale-set.labels" . | fromYaml }} + {{- $extra := dict "app.kubernetes.io/component" "" }} + {{- $reserved := merge $base $extra }} {{- with .Values.labels }} - {{- toYaml . | nindent 4 }} + {{- range $k, $v := . }} + {{- if not (or (hasKey $reserved $k) (hasPrefix "actions.github.com/" $k)) }} + {{ $k }}: {{ $v | quote }} + {{- end }} + {{- end }} {{- end }} {{- if $hasCustomResourceMeta }} {{- with .Values.resourceMeta.noPermissionServiceAccount.labels }}