Skip to content

Commit 1019c9c

Browse files
authored
Switch trigger Helm chart RBAC from cluster to namespace scope and bump version (#2232)
* replace supervisor cluster role with ns-scoped role * fix cross-ns binding * bump chart version
1 parent 469a8df commit 1019c9c

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

hosting/k8s/helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: trigger
33
description: The official Trigger.dev Helm chart
44
type: application
5-
version: 4.0.0-beta.14
5+
version: 4.0.0-beta.15
66
appVersion: trigger-helm-rc.1
77
home: https://trigger.dev
88
sources:

hosting/k8s/helm/templates/_helpers.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,10 @@ Create the name of the supervisor service account to use
278278
{{- end }}
279279

280280
{{/*
281-
Create the name of the supervisor cluster role to use
281+
Create the name of the supervisor role to use
282282
*/}}
283-
{{- define "trigger-v4.supervisorClusterRoleName" -}}
284-
{{- default (printf "%s-supervisor-%s" (include "trigger-v4.fullname" .) .Release.Namespace) .Values.supervisor.rbac.clusterRole.name }}
283+
{{- define "trigger-v4.supervisorRoleName" -}}
284+
{{- default (printf "%s-supervisor-%s" (include "trigger-v4.fullname" .) .Release.Namespace) .Values.supervisor.rbac.role.name }}
285285
{{- end }}
286286

287287
{{/*

hosting/k8s/helm/templates/supervisor.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ metadata:
1414
---
1515
{{- if .Values.supervisor.rbac.create }}
1616
apiVersion: rbac.authorization.k8s.io/v1
17-
kind: ClusterRole
17+
kind: Role
1818
metadata:
19-
name: {{ include "trigger-v4.supervisorClusterRoleName" . }}
19+
name: {{ include "trigger-v4.supervisorRoleName" . }}
20+
namespace: {{ default .Release.Namespace .Values.supervisor.config.kubernetes.namespace }}
2021
labels:
2122
{{- $component := "supervisor" }}
2223
{{- include "trigger-v4.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
@@ -26,19 +27,20 @@ rules:
2627
verbs: ["create", "delete", "deletecollection", "get", "list", "watch"]
2728
---
2829
apiVersion: rbac.authorization.k8s.io/v1
29-
kind: ClusterRoleBinding
30+
kind: RoleBinding
3031
metadata:
31-
name: {{ include "trigger-v4.supervisorClusterRoleName" . }}-binding
32+
name: {{ include "trigger-v4.supervisorRoleName" . }}-binding
33+
namespace: {{ default .Release.Namespace .Values.supervisor.config.kubernetes.namespace }}
3234
labels:
3335
{{- $component := "supervisor" }}
3436
{{- include "trigger-v4.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
3537
subjects:
3638
- kind: ServiceAccount
3739
name: {{ include "trigger-v4.supervisorServiceAccountName" . }}
38-
namespace: {{ .Release.Namespace }}
40+
namespace: {{ default .Release.Namespace }}
3941
roleRef:
40-
kind: ClusterRole
41-
name: {{ include "trigger-v4.supervisorClusterRoleName" . }}
42+
kind: Role
43+
name: {{ include "trigger-v4.supervisorRoleName" . }}
4244
apiGroup: rbac.authorization.k8s.io
4345
{{- end }}
4446
---

hosting/k8s/helm/values.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,8 @@ supervisor:
281281
annotations: {}
282282
rbac:
283283
create: true
284-
# Cluster-level permissions for pod management
285-
clusterRole:
286-
create: true
284+
# Namespace-scoped permissions for pod management
285+
role:
287286
name: ""
288287
# Extra environment variables for Supervisor
289288
extraEnvVars:

0 commit comments

Comments
 (0)