Skip to content

Commit 1956a87

Browse files
authored
Fixes #173 Support both Role Binding and Cluster Role Binding dependi… (#174)
* Fixes #173 Support both Role Binding and Cluster Role Binding depending on rbac.limit_to_namespace * Rev version * Get Role/Cluster the right way around
1 parent 6173081 commit 1956a87

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

charts/pulsar/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apiVersion: v1
2121
appVersion: "2.7.2"
2222
description: Apache Pulsar Helm chart for Kubernetes
2323
name: pulsar
24-
version: 2.7.4
24+
version: 2.7.5
2525
home: https://pulsar.apache.org
2626
sources:
2727
- https://github.com/apache/pulsar

charts/pulsar/templates/broker-cluster-role-binding.yaml

+15-2
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,40 @@
2222
apiVersion: rbac.authorization.k8s.io/v1
2323
{{- if .Values.rbac.limit_to_namespace }}
2424
kind: RoleBinding
25+
metadata:
26+
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-rolebinding"
2527
{{- else}}
2628
kind: ClusterRoleBinding
27-
{{- end}}
2829
metadata:
2930
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-clusterrolebinding"
31+
{{- end}}
3032
labels:
3133
{{- include "pulsar.standardLabels" . | nindent 4 }}
3234
roleRef:
3335
apiGroup: rbac.authorization.k8s.io
36+
{{- if .Values.rbac.limit_to_namespace }}
37+
kind: Role
38+
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-role"
39+
{{- else}}
3440
kind: ClusterRole
3541
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-clusterrole"
42+
{{- end}}
3643
subjects:
3744
- kind: ServiceAccount
3845
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-acct"
3946
namespace: {{ template "pulsar.namespace" . }}
4047
---
4148

4249
apiVersion: rbac.authorization.k8s.io/v1
50+
{{- if .Values.rbac.limit_to_namespace }}
51+
kind: Role
52+
metadata:
53+
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-role"
54+
{{- else}}
4355
kind: ClusterRole
4456
metadata:
4557
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-clusterrole"
58+
{{- end}}
4659
labels:
4760
{{- include "pulsar.standardLabels" . | nindent 4 }}
4861
rules:
@@ -67,4 +80,4 @@ rules:
6780
- patch
6881
---
6982

70-
{{- end }}
83+
{{- end }}

0 commit comments

Comments
 (0)