Skip to content

Commit 1a3ee22

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

8 files changed

+14
-14
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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
99
subjects:
1010
- kind: ServiceAccount
1111
name: {{ IncludeTemplate "service-account.name" }}
@@ -14,12 +14,12 @@ subjects:
1414
apiVersion: rbac.authorization.k8s.io/v1
1515
kind: RoleBinding
1616
metadata:
17-
name: ack-configmaps-cache-{{ .ControllerName }}-controller
17+
name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache
1818
namespace: {{ "{{ .Release.Namespace }}" }}
1919
roleRef:
2020
kind: Role
2121
apiGroup: rbac.authorization.k8s.io
22-
name: ack-configmaps-cache-{{ .ControllerName }}-controller
22+
name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache
2323
subjects:
2424
- kind: ServiceAccount
2525
name: {{ IncludeTemplate "service-account.name" }}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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
55
rules:
66
- apiGroups:
77
- ""
@@ -15,7 +15,7 @@ rules:
1515
apiVersion: rbac.authorization.k8s.io/v1
1616
kind: Role
1717
metadata:
18-
name: ack-configmaps-cache-{{ .ControllerName }}-controller
18+
name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache
1919
namespace: {{ "{{ .Release.Namespace }}" }}
2020
rules:
2121
- apiGroups:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ metadata:
2727
roleRef:
2828
kind: Role
2929
apiGroup: rbac.authorization.k8s.io
30-
name: ack-{{ .ControllerName }}-controller
30+
name: {{ IncludeTemplate "app.fullname" }}-controller
3131
subjects:
3232
- kind: ServiceAccount
3333
name: {{ "{{ $serviceAccountName }}" }}

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

+2-2
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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 }}" }}
@@ -11,7 +11,7 @@ metadata:
1111
roleRef:
1212
apiGroup: rbac.authorization.k8s.io
1313
kind: Role
14-
name: {{.ControllerName}}-leader-election-role
14+
name: {{ IncludeTemplate "app.fullname" }}-leader-election-role
1515
subjects:
1616
- kind: ServiceAccount
1717
name: {{ IncludeTemplate "service-account.name" }}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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 }}" }}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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 }}" }}
88
rules:
99
- apiGroups:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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 }}" }}
88
rules:
99
- apiGroups:

0 commit comments

Comments
 (0)