Skip to content

Commit abd45b4

Browse files
michaelhtmmichaelhtm
authored
feat: Make helm chart names dynamic (#593)
Issue [#2430](aws-controllers-k8s/community#2430) Description of changes: extra changes: add labels to roles/rolebindings By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 66a58d2 commit abd45b4

8 files changed

+104
-17
lines changed

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
4-
name: ack-namespaces-cache-{{ .ControllerName }}-controller
4+
name: {{ IncludeTemplate "app.fullname" }}-namespace-caches
5+
labels:
6+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
7+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
8+
app.kubernetes.io/managed-by: Helm
9+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
10+
k8s-app: {{ IncludeTemplate "app.name" }}
11+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
512
roleRef:
613
kind: ClusterRole
714
apiGroup: rbac.authorization.k8s.io
8-
name: ack-namespaces-cache-{{ .ControllerName }}-controller
15+
name: {{ IncludeTemplate "app.fullname" }}-namespace-caches
916
subjects:
1017
- kind: ServiceAccount
1118
name: {{ IncludeTemplate "service-account.name" }}
@@ -14,12 +21,19 @@ subjects:
1421
apiVersion: rbac.authorization.k8s.io/v1
1522
kind: RoleBinding
1623
metadata:
17-
name: ack-configmaps-cache-{{ .ControllerName }}-controller
24+
name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache
1825
namespace: {{ "{{ .Release.Namespace }}" }}
26+
labels:
27+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
28+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
29+
app.kubernetes.io/managed-by: Helm
30+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
31+
k8s-app: {{ IncludeTemplate "app.name" }}
32+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
1933
roleRef:
2034
kind: Role
2135
apiGroup: rbac.authorization.k8s.io
22-
name: ack-configmaps-cache-{{ .ControllerName }}-controller
36+
name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache
2337
subjects:
2438
- kind: ServiceAccount
2539
name: {{ IncludeTemplate "service-account.name" }}

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
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+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
7+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
8+
app.kubernetes.io/managed-by: Helm
9+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
10+
k8s-app: {{ IncludeTemplate "app.name" }}
11+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
512
rules:
613
- apiGroups:
714
- ""
@@ -15,8 +22,15 @@ rules:
1522
apiVersion: rbac.authorization.k8s.io/v1
1623
kind: Role
1724
metadata:
18-
name: ack-configmaps-cache-{{ .ControllerName }}-controller
25+
name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache
1926
namespace: {{ "{{ .Release.Namespace }}" }}
27+
labels:
28+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
29+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
30+
app.kubernetes.io/managed-by: Helm
31+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
32+
k8s-app: {{ IncludeTemplate "app.name" }}
33+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
2034
rules:
2135
- apiGroups:
2236
- ""

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
5-
name: {{ IncludeTemplate "app.fullname" }}
5+
name: {{ IncludeTemplate "app.fullname" }}-rolebinding
6+
labels:
7+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
8+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
9+
app.kubernetes.io/managed-by: Helm
10+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
11+
k8s-app: {{ IncludeTemplate "app.name" }}
12+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
613
roleRef:
714
kind: ClusterRole
815
apiGroup: rbac.authorization.k8s.io
9-
name: ack-{{ .ControllerName }}-controller
16+
name: {{ IncludeTemplate "app.fullname" }}
1017
subjects:
1118
- kind: ServiceAccount
1219
name: {{ IncludeTemplate "service-account.name" }}
@@ -17,17 +24,26 @@ subjects:
1724
{{ VarIncludeTemplate "fullname" "app.fullname" }}
1825
{{ "{{ $releaseNamespace := .Release.Namespace }}" }}
1926
{{ VarIncludeTemplate "serviceAccountName" "service-account.name" }}
27+
{{ VarIncludeTemplate "chartVersion" "chart.name-version" }}
28+
{{ "{{ $appVersion := .Chart.AppVersion | quote }}" }}
2029
{{ "{{ range $namespaces }}" }}
2130
---
2231
apiVersion: rbac.authorization.k8s.io/v1
2332
kind: RoleBinding
2433
metadata:
25-
name: {{ "{{ $fullname }}" }}
34+
name: {{ "{{ $fullname }}" }}-{{ "{{ . }}" }}
2635
namespace: {{ "{{ . }}" }}
36+
labels:
37+
app.kubernetes.io/name: {{ "{{ $fullname }}" }}
38+
app.kubernetes.io/instance: {{ "{{ $.Release.Name }}" }}
39+
app.kubernetes.io/managed-by: Helm
40+
app.kubernetes.io/version: {{ "{{ $appVersion }}" }}
41+
k8s-app: {{ "{{ $fullname }}" }}
42+
helm.sh/chart: {{ "{{ $chartVersion }}" }}
2743
roleRef:
2844
kind: Role
2945
apiGroup: rbac.authorization.k8s.io
30-
name: ack-{{ .ControllerName }}-controller
46+
name: {{ "{{ $fullname }}" }}-{{ "{{ . }}" }}
3147
subjects:
3248
- kind: ServiceAccount
3349
name: {{ "{{ $serviceAccountName }}" }}

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
{{ "{{ $labels := .Values.role.labels }}" }}
2+
{{ "{{ $appVersion := .Chart.AppVersion | quote }}" }}
23
{{ VarIncludeTemplate "rbacRules" "rbac-rules" }}
4+
{{ VarIncludeTemplate "fullname" "app.fullname" }}
5+
{{ VarIncludeTemplate "chartVersion" "chart.name-version" }}
36
{{ "{{ if eq .Values.installScope \"cluster\" }}" }}
47
apiVersion: rbac.authorization.k8s.io/v1
58
kind: ClusterRole
69
metadata:
7-
name: ack-{{ .ControllerName }}-controller
10+
name: {{ IncludeTemplate "app.fullname" }}
811
labels:
12+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
13+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
14+
app.kubernetes.io/managed-by: Helm
15+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
16+
k8s-app: {{ IncludeTemplate "app.name" }}
17+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
918
{{ "{{- range $key, $value := $labels }}" }}
1019
{{ "{{ $key }}: {{ $value | quote }}" }}
1120
{{ "{{- end }}" }}
@@ -18,9 +27,15 @@ metadata:
1827
apiVersion: rbac.authorization.k8s.io/v1
1928
kind: Role
2029
metadata:
21-
name: ack-{{ .ControllerName }}-controller
30+
name: {{ "{{ $fullname }}" }}-{{ "{{ . }}" }}
2231
namespace: {{ "{{ . }}" }}
2332
labels:
33+
app.kubernetes.io/name: {{ "{{ $fullname }}" }}
34+
app.kubernetes.io/instance: {{ "{{ $.Release.Name }}" }}
35+
app.kubernetes.io/managed-by: Helm
36+
app.kubernetes.io/version: {{ "{{ $appVersion }}" }}
37+
k8s-app: {{ "{{ $fullname }}" }}
38+
helm.sh/chart: {{ "{{ $chartVersion }}" }}
2439
{{ "{{- range $key, $value := $labels }}" }}
2540
{{ "{{ $key }}: {{ $value | quote }}" }}
2641
{{ "{{- end }}" }}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,23 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: RoleBinding
44
metadata:
5-
name: {{.ControllerName}}-leader-election-rolebinding
5+
name: {{ IncludeTemplate "app.fullname" }}-leaderelection
66
{{ "{{ if .Values.leaderElection.namespace }}" }}
77
namespace: {{ "{{ .Values.leaderElection.namespace }}" }}
88
{{ "{{ else }}" }}
99
namespace: {{ "{{ .Release.Namespace }}" }}
1010
{{ "{{ end }}" }}
11+
labels:
12+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
13+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
14+
app.kubernetes.io/managed-by: Helm
15+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
16+
k8s-app: {{ IncludeTemplate "app.name" }}
17+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
1118
roleRef:
1219
apiGroup: rbac.authorization.k8s.io
1320
kind: Role
14-
name: {{.ControllerName}}-leader-election-role
21+
name: {{ IncludeTemplate "app.fullname" }}-leaderelection
1522
subjects:
1623
- kind: ServiceAccount
1724
name: {{ IncludeTemplate "service-account.name" }}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,19 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
5-
name: {{.ControllerName}}-leader-election-role
5+
name: {{ IncludeTemplate "app.fullname" }}-leaderelection
66
{{ "{{ if .Values.leaderElection.namespace }}" }}
77
namespace: {{ "{{ .Values.leaderElection.namespace }}" }}
88
{{ "{{ else }}" }}
99
namespace: {{ "{{ .Release.Namespace }}" }}
1010
{{ "{{ end }}" }}
11+
labels:
12+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
13+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
14+
app.kubernetes.io/managed-by: Helm
15+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
16+
k8s-app: {{ IncludeTemplate "app.name" }}
17+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
1118
rules:
1219
- apiGroups:
1320
- coordination.k8s.io

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@ 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+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
10+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
11+
app.kubernetes.io/managed-by: Helm
12+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
13+
k8s-app: {{ IncludeTemplate "app.name" }}
14+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
815
rules:
916
- apiGroups:
1017
- {{ .APIGroup }}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@ 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+
app.kubernetes.io/name: {{ IncludeTemplate "app.name" }}
10+
app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }}
11+
app.kubernetes.io/managed-by: Helm
12+
app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }}
13+
k8s-app: {{ IncludeTemplate "app.name" }}
14+
helm.sh/chart: {{ IncludeTemplate "chart.name-version" }}
815
rules:
916
- apiGroups:
1017
- {{ .APIGroup }}

0 commit comments

Comments
 (0)