changes!!

Author: michaelhtm

helm/templates/caches-role-binding.yaml

@@ -1,11 +1,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: ack-namespaces-cache-sqs-controller
+  name: {{ include "ack-sqs-controller.app.fullname" . }}
 roleRef:
   kind: ClusterRole
   apiGroup: rbac.authorization.k8s.io
-  name: ack-namespaces-cache-sqs-controller
+  name: {{ include "ack-sqs-controller.app.fullname" . }}
 subjects:
 - kind: ServiceAccount
   name: {{ include "ack-sqs-controller.service-account.name" . }}
@@ -14,12 +14,12 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: ack-configmaps-cache-sqs-controller
+  name: {{ include "ack-sqs-controller.app.fullname" . }}
   namespace: {{ .Release.Namespace }}
 roleRef:
   kind: Role
   apiGroup: rbac.authorization.k8s.io
-  name: ack-configmaps-cache-sqs-controller
+  name: {{ include "ack-sqs-controller.app.fullname" . }}
 subjects:
 - kind: ServiceAccount
   name: {{ include "ack-sqs-controller.service-account.name" . }}

helm/templates/caches-role.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: ack-namespaces-cache-sqs-controller
+  name: {{ include "ack-sqs-controller.app.fullname" . }}-clusterrole
 rules:
 - apiGroups:
   - ""
@@ -15,7 +15,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: ack-namespaces-cache-sqs-controller
+  name: {{ include "ack-sqs-controller.app.fullname" . }}-role
   namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:

helm/templates/cluster-role-binding.yaml

@@ -2,11 +2,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "ack-sqs-controller.app.fullname" . }}
+  name: {{ include "ack-sqs-controller.app.fullname" . }}-rolebinding
 roleRef:
   kind: ClusterRole
   apiGroup: rbac.authorization.k8s.io
-  name: ack-sqs-controller
+  name: {{ include "ack-sqs-controller.app.fullname" . }}
 subjects:
 - kind: ServiceAccount
   name: {{ include "ack-sqs-controller.service-account.name" . }}
@@ -22,12 +22,12 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ $fullname }}
+  name: {{ $fullname }}-{{ . }}
   namespace: {{ . }}
 roleRef:
   kind: Role
   apiGroup: rbac.authorization.k8s.io
-  name: ack-sqs-controller
+  name: {{ $fullname }}-{{ . }}
 subjects:
 - kind: ServiceAccount
   name: {{ $serviceAccountName }}

helm/templates/cluster-role-controller.yaml

@@ -1,10 +1,11 @@
 {{ $labels := .Values.role.labels }}
 {{ $rbacRules := include "ack-sqs-controller.rbac-rules" . }}
+{{ $fullname := include "ack-sqs-controller.app.fullname" . }}
 {{ if eq .Values.installScope "cluster" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: ack-sqs-controller
+  name: {{ include "ack-sqs-controller.app.fullname" . }}
   labels:
   {{- range $key, $value := $labels }}
     {{ $key }}: {{ $value | quote }}
@@ -18,7 +19,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: ack-sqs-controller
+  name: {{ $fullname }}-{{ . }}
   namespace: {{ . }}
   labels:
   {{- range $key, $value := $labels }}

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

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: sqs-leader-election-rolebinding
+  name: {{ include "ack-sqs-controller.app.fullname" . }}
 {{ if .Values.leaderElection.namespace }}
   namespace: {{ .Values.leaderElection.namespace }}
 {{ else }}
@@ -11,7 +11,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: sqs-leader-election-role
+  name: {{ include "ack-sqs-controller.app.fullname" . }}
 subjects:
 - kind: ServiceAccount
   name: {{ include "ack-sqs-controller.service-account.name" . }}

helm/templates/leader-election-role.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: sqs-leader-election-role
+  name: {{ include "ack-sqs-controller.app.fullname" . }}-election
 {{ if .Values.leaderElection.namespace }}
   namespace: {{ .Values.leaderElection.namespace }}
 {{ else }}

helm/templates/role-reader.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: ack-sqs-reader
+  name: {{ include "ack-sqs-controller.app.fullname" . }}-reader
   namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:

helm/templates/role-writer.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: ack-sqs-writer
+  name: {{ include "ack-sqs-controller.app.fullname" . }}-writer
   namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups: