Skip to content

Commit 8cfb0d8

Browse files
authored
[loki] fix nil pointer in rolebinding.yaml (#315)
1 parent 641f305 commit 8cfb0d8

File tree

3 files changed

+81
-2
lines changed

3 files changed

+81
-2
lines changed

charts/loki/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Helm chart for Grafana Loki supporting monolithic, simple scalable,
44
type: application
55
# renovate: docker=docker.io/grafana/loki
66
appVersion: 3.7.1
7-
version: 11.4.3
7+
version: 11.4.4
88
kubeVersion: ">=1.25.0-0"
99
home: https://grafana-community.github.io/helm-charts
1010
sources:

charts/loki/templates/rolebinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ roleRef:
1212
name: {{ include "loki.name" . }}
1313
subjects:
1414
- kind: ServiceAccount
15-
name: {{ include "loki.serviceAccountName" . }}
15+
name: {{ include "loki.serviceAccountName" (dict "ctx" . "component" .Values "target" "") }}
1616
namespace: {{ include "loki.namespace" $ }}
1717
{{- end }}
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# $schema: https://raw.githubusercontent.com/helm-unittest/helm-unittest/refs/heads/main/schema/helm-testsuite.json
2+
suite: rolebinding
3+
templates:
4+
- rolebinding.yaml
5+
6+
tests:
7+
- it: is not rendered by default
8+
asserts:
9+
- hasDocuments:
10+
count: 0
11+
12+
- it: is not rendered when namespaced=true but sidecar.rules.enabled=false
13+
set:
14+
rbac.namespaced: true
15+
sidecar.rules.enabled: false
16+
asserts:
17+
- hasDocuments:
18+
count: 0
19+
20+
- it: is rendered when rbac.namespaced=true and sidecar.rules.enabled=true
21+
set:
22+
rbac.namespaced: true
23+
sidecar.rules.enabled: true
24+
asserts:
25+
- hasDocuments:
26+
count: 1
27+
- equal:
28+
path: kind
29+
value: RoleBinding
30+
31+
- it: is rendered when rbac.sccEnabled=true
32+
set:
33+
rbac.sccEnabled: true
34+
asserts:
35+
- hasDocuments:
36+
count: 1
37+
- equal:
38+
path: kind
39+
value: RoleBinding
40+
41+
- it: subject uses global service account name by default (namespaced)
42+
set:
43+
rbac.namespaced: true
44+
sidecar.rules.enabled: true
45+
asserts:
46+
- equal:
47+
path: subjects[0].name
48+
value: RELEASE-NAME-loki
49+
50+
- it: subject uses custom serviceAccount.name when set (namespaced)
51+
set:
52+
rbac.namespaced: true
53+
sidecar.rules.enabled: true
54+
serviceAccount.name: my-custom-sa
55+
asserts:
56+
- equal:
57+
path: subjects[0].name
58+
value: my-custom-sa
59+
60+
- it: subject uses custom serviceAccount.name when set (sccEnabled)
61+
set:
62+
rbac.sccEnabled: true
63+
serviceAccount.name: my-custom-sa
64+
asserts:
65+
- equal:
66+
path: subjects[0].name
67+
value: my-custom-sa
68+
69+
- it: roleRef references the loki role by name
70+
set:
71+
rbac.namespaced: true
72+
sidecar.rules.enabled: true
73+
asserts:
74+
- equal:
75+
path: roleRef.name
76+
value: loki
77+
- equal:
78+
path: roleRef.kind
79+
value: Role

0 commit comments

Comments
 (0)