Skip to content

Commit b20cdd3

Browse files
committed
feat: Make helm chart names dynamic
extra changes: add labels to roles/rolebindings
1 parent 016d4c5 commit b20cdd3

8 files changed

+46
-14
lines changed

templates/helm/templates/caches-role-binding.yaml.tpl

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
4-
name: ack-namespaces-cache-{{ .ControllerName }}-controller
4+
name: {{ IncludeTemplate "app.fullname" }}-namespaces-cache
55
roleRef:
66
kind: ClusterRole
77
apiGroup: rbac.authorization.k8s.io
8-
name: ack-namespaces-cache-{{ .ControllerName }}-controller
8+
name: {{ IncludeTemplate "app.fullname" }}-namespaces-cache
9+
labels:
10+
{{ "{{- range $key, $value := $labels }}" }}
11+
{{ "{{ $key }}: {{ $value | quote }}" }}
12+
{{ "{{- end }}" }}
913
subjects:
1014
- kind: ServiceAccount
1115
name: {{ IncludeTemplate "service-account.name" }}
@@ -14,12 +18,16 @@ subjects:
1418
apiVersion: rbac.authorization.k8s.io/v1
1519
kind: RoleBinding
1620
metadata:
17-
name: ack-configmaps-cache-{{ .ControllerName }}-controller
21+
name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache
1822
namespace: {{ "{{ .Release.Namespace }}" }}
23+
labels:
24+
{{ "{{- range $key, $value := $labels }}" }}
25+
{{ "{{ $key }}: {{ $value | quote }}" }}
26+
{{ "{{- end }}" }}
1927
roleRef:
2028
kind: Role
2129
apiGroup: rbac.authorization.k8s.io
22-
name: ack-configmaps-cache-{{ .ControllerName }}-controller
30+
name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache
2331
subjects:
2432
- kind: ServiceAccount
2533
name: {{ IncludeTemplate "service-account.name" }}

templates/helm/templates/caches-role.yaml.tpl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
4-
name: ack-namespaces-cache-{{ .ControllerName }}-controller
4+
name: {{ IncludeTemplate "app.fullname" }}-namespaces-cache
5+
labels:
6+
{{ "{{- range $key, $value := $labels }}" }}
7+
{{ "{{ $key }}: {{ $value | quote }}" }}
8+
{{ "{{- end }}" }}
59
rules:
610
- apiGroups:
711
- ""
@@ -15,7 +19,7 @@ rules:
1519
apiVersion: rbac.authorization.k8s.io/v1
1620
kind: Role
1721
metadata:
18-
name: ack-configmaps-cache-{{ .ControllerName }}-controller
22+
name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache
1923
namespace: {{ "{{ .Release.Namespace }}" }}
2024
rules:
2125
- apiGroups:

templates/helm/templates/cluster-role-binding.yaml.tpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@ kind: RoleBinding
2424
metadata:
2525
name: {{ "{{ $fullname }}" }}
2626
namespace: {{ "{{ . }}" }}
27+
labels:
28+
{{ "{{- range $key, $value := $labels }}" }}
29+
{{ "{{ $key }}: {{ $value | quote }}" }}
30+
{{ "{{- end }}" }}
2731
roleRef:
2832
kind: Role
2933
apiGroup: rbac.authorization.k8s.io
30-
name: ack-{{ .ControllerName }}-controller
34+
name: {{ IncludeTemplate "app.fullname" }}-controller
3135
subjects:
3236
- kind: ServiceAccount
3337
name: {{ "{{ $serviceAccountName }}" }}

templates/helm/templates/cluster-role-controller.yaml.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
apiVersion: rbac.authorization.k8s.io/v1
55
kind: ClusterRole
66
metadata:
7-
name: ack-{{ .ControllerName }}-controller
7+
name: {{ IncludeTemplate "app.fullname" }}-controller
88
labels:
99
{{ "{{- range $key, $value := $labels }}" }}
1010
{{ "{{ $key }}: {{ $value | quote }}" }}
@@ -18,7 +18,7 @@ metadata:
1818
apiVersion: rbac.authorization.k8s.io/v1
1919
kind: Role
2020
metadata:
21-
name: ack-{{ .ControllerName }}-controller
21+
name: {{ IncludeTemplate "app.fullname" }}-controller
2222
namespace: {{ "{{ . }}" }}
2323
labels:
2424
{{ "{{- range $key, $value := $labels }}" }}

templates/helm/templates/leader-election-role-binding.yaml.tpl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: RoleBinding
44
metadata:
5-
name: {{.ControllerName}}-leader-election-rolebinding
5+
name: {{ IncludeTemplate "app.fullname" }}-leader-election-rolebinding
66
{{ "{{ if .Values.leaderElection.namespace }}" }}
77
namespace: {{ "{{ .Values.leaderElection.namespace }}" }}
88
{{ "{{ else }}" }}
99
namespace: {{ "{{ .Release.Namespace }}" }}
1010
{{ "{{ end }}" }}
11+
labels:
12+
{{ "{{- range $key, $value := $labels }}" }}
13+
{{ "{{ $key }}: {{ $value | quote }}" }}
14+
{{ "{{- end }}" }}
1115
roleRef:
1216
apiGroup: rbac.authorization.k8s.io
1317
kind: Role
14-
name: {{.ControllerName}}-leader-election-role
18+
name: {{ IncludeTemplate "app.fullname" }}-leader-election-role
1519
subjects:
1620
- kind: ServiceAccount
1721
name: {{ IncludeTemplate "service-account.name" }}

templates/helm/templates/leader-election-role.yaml.tpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
5-
name: {{.ControllerName}}-leader-election-role
5+
name: {{ "{{ IncludeTemplate "app.fullname" }}" }}-leader-election-role
66
{{ "{{ if .Values.leaderElection.namespace }}" }}
77
namespace: {{ "{{ .Values.leaderElection.namespace }}" }}
88
{{ "{{ else }}" }}
99
namespace: {{ "{{ .Release.Namespace }}" }}
1010
{{ "{{ end }}" }}
11+
labels:
12+
{{ "{{- range $key, $value := $labels }}" }}
13+
{{ "{{ $key }}: {{ $value | quote }}" }}
14+
{{ "{{- end }}" }}
1115
rules:
1216
- apiGroups:
1317
- coordination.k8s.io

templates/helm/templates/role-reader.yaml.tpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
55
creationTimestamp: null
6-
name: ack-{{ .ControllerName }}-reader
6+
name: {{ IncludeTemplate "app.fullname" }}-reader
77
namespace: {{ "{{ .Release.Namespace }}" }}
8+
labels:
9+
{{ "{{- range $key, $value := $labels }}" }}
10+
{{ "{{ $key }}: {{ $value | quote }}" }}
11+
{{ "{{- end }}" }}
812
rules:
913
- apiGroups:
1014
- {{ .APIGroup }}

templates/helm/templates/role-writer.yaml.tpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
55
creationTimestamp: null
6-
name: ack-{{ .ControllerName }}-writer
6+
name: {{ IncludeTemplate "app.fullname" }}-writer
77
namespace: {{ "{{ .Release.Namespace }}" }}
8+
labels:
9+
{{ "{{- range $key, $value := $labels }}" }}
10+
{{ "{{ $key }}: {{ $value | quote }}" }}
11+
{{ "{{- end }}" }}
812
rules:
913
- apiGroups:
1014
- {{ .APIGroup }}

0 commit comments

Comments
 (0)