diff --git a/templates/helm/templates/caches-role-binding.yaml.tpl b/templates/helm/templates/caches-role-binding.yaml.tpl index 57b753f7..1e0e5ec3 100644 --- a/templates/helm/templates/caches-role-binding.yaml.tpl +++ b/templates/helm/templates/caches-role-binding.yaml.tpl @@ -1,11 +1,18 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ack-namespaces-cache-{{ .ControllerName }}-controller + name: {{ IncludeTemplate "app.fullname" }}-namespace-caches + labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} roleRef: kind: ClusterRole apiGroup: rbac.authorization.k8s.io - name: ack-namespaces-cache-{{ .ControllerName }}-controller + name: {{ IncludeTemplate "app.fullname" }}-namespace-caches subjects: - kind: ServiceAccount name: {{ IncludeTemplate "service-account.name" }} @@ -14,12 +21,19 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: ack-configmaps-cache-{{ .ControllerName }}-controller + name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache namespace: {{ "{{ .Release.Namespace }}" }} + labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} roleRef: kind: Role apiGroup: rbac.authorization.k8s.io - name: ack-configmaps-cache-{{ .ControllerName }}-controller + name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache subjects: - kind: ServiceAccount name: {{ IncludeTemplate "service-account.name" }} diff --git a/templates/helm/templates/caches-role.yaml.tpl b/templates/helm/templates/caches-role.yaml.tpl index 9451709b..49dbe8a4 100644 --- a/templates/helm/templates/caches-role.yaml.tpl +++ b/templates/helm/templates/caches-role.yaml.tpl @@ -1,7 +1,14 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ack-namespaces-cache-{{ .ControllerName }}-controller + name: {{ IncludeTemplate "app.fullname" }}-namespaces-cache + labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} rules: - apiGroups: - "" @@ -15,8 +22,15 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ack-configmaps-cache-{{ .ControllerName }}-controller + name: {{ IncludeTemplate "app.fullname" }}-configmaps-cache namespace: {{ "{{ .Release.Namespace }}" }} + labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} rules: - apiGroups: - "" diff --git a/templates/helm/templates/cluster-role-binding.yaml.tpl b/templates/helm/templates/cluster-role-binding.yaml.tpl index 78e50682..17b7d9b2 100644 --- a/templates/helm/templates/cluster-role-binding.yaml.tpl +++ b/templates/helm/templates/cluster-role-binding.yaml.tpl @@ -2,11 +2,18 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ IncludeTemplate "app.fullname" }} + name: {{ IncludeTemplate "app.fullname" }}-rolebinding + labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} roleRef: kind: ClusterRole apiGroup: rbac.authorization.k8s.io - name: ack-{{ .ControllerName }}-controller + name: {{ IncludeTemplate "app.fullname" }} subjects: - kind: ServiceAccount name: {{ IncludeTemplate "service-account.name" }} @@ -17,17 +24,26 @@ subjects: {{ VarIncludeTemplate "fullname" "app.fullname" }} {{ "{{ $releaseNamespace := .Release.Namespace }}" }} {{ VarIncludeTemplate "serviceAccountName" "service-account.name" }} +{{ VarIncludeTemplate "chartVersion" "chart.name-version" }} +{{ "{{ $appVersion := .Chart.AppVersion | quote }}" }} {{ "{{ range $namespaces }}" }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ "{{ $fullname }}" }} + name: {{ "{{ $fullname }}" }}-{{ "{{ . }}" }} namespace: {{ "{{ . }}" }} + labels: + app.kubernetes.io/name: {{ "{{ $fullname }}" }} + app.kubernetes.io/instance: {{ "{{ $.Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ $appVersion }}" }} + k8s-app: {{ "{{ $fullname }}" }} + helm.sh/chart: {{ "{{ $chartVersion }}" }} roleRef: kind: Role apiGroup: rbac.authorization.k8s.io - name: ack-{{ .ControllerName }}-controller + name: {{ "{{ $fullname }}" }}-{{ "{{ . }}" }} subjects: - kind: ServiceAccount name: {{ "{{ $serviceAccountName }}" }} diff --git a/templates/helm/templates/cluster-role-controller.yaml.tpl b/templates/helm/templates/cluster-role-controller.yaml.tpl index 378b284f..bb0a9192 100644 --- a/templates/helm/templates/cluster-role-controller.yaml.tpl +++ b/templates/helm/templates/cluster-role-controller.yaml.tpl @@ -1,11 +1,20 @@ {{ "{{ $labels := .Values.role.labels }}" }} +{{ "{{ $appVersion := .Chart.AppVersion | quote }}" }} {{ VarIncludeTemplate "rbacRules" "rbac-rules" }} +{{ VarIncludeTemplate "fullname" "app.fullname" }} +{{ VarIncludeTemplate "chartVersion" "chart.name-version" }} {{ "{{ if eq .Values.installScope \"cluster\" }}" }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ack-{{ .ControllerName }}-controller + name: {{ IncludeTemplate "app.fullname" }} labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} {{ "{{- range $key, $value := $labels }}" }} {{ "{{ $key }}: {{ $value | quote }}" }} {{ "{{- end }}" }} @@ -18,9 +27,15 @@ metadata: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ack-{{ .ControllerName }}-controller + name: {{ "{{ $fullname }}" }}-{{ "{{ . }}" }} namespace: {{ "{{ . }}" }} labels: + app.kubernetes.io/name: {{ "{{ $fullname }}" }} + app.kubernetes.io/instance: {{ "{{ $.Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ $appVersion }}" }} + k8s-app: {{ "{{ $fullname }}" }} + helm.sh/chart: {{ "{{ $chartVersion }}" }} {{ "{{- range $key, $value := $labels }}" }} {{ "{{ $key }}: {{ $value | quote }}" }} {{ "{{- end }}" }} diff --git a/templates/helm/templates/leader-election-role-binding.yaml.tpl b/templates/helm/templates/leader-election-role-binding.yaml.tpl index 005c1820..15f40ec7 100644 --- a/templates/helm/templates/leader-election-role-binding.yaml.tpl +++ b/templates/helm/templates/leader-election-role-binding.yaml.tpl @@ -2,16 +2,23 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{.ControllerName}}-leader-election-rolebinding + name: {{ IncludeTemplate "app.fullname" }}-leaderelection {{ "{{ if .Values.leaderElection.namespace }}" }} namespace: {{ "{{ .Values.leaderElection.namespace }}" }} {{ "{{ else }}" }} namespace: {{ "{{ .Release.Namespace }}" }} {{ "{{ end }}" }} + labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{.ControllerName}}-leader-election-role + name: {{ IncludeTemplate "app.fullname" }}-leaderelection subjects: - kind: ServiceAccount name: {{ IncludeTemplate "service-account.name" }} diff --git a/templates/helm/templates/leader-election-role.yaml.tpl b/templates/helm/templates/leader-election-role.yaml.tpl index a21a5277..845f8d4a 100644 --- a/templates/helm/templates/leader-election-role.yaml.tpl +++ b/templates/helm/templates/leader-election-role.yaml.tpl @@ -2,12 +2,19 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{.ControllerName}}-leader-election-role + name: {{ IncludeTemplate "app.fullname" }}-leaderelection {{ "{{ if .Values.leaderElection.namespace }}" }} namespace: {{ "{{ .Values.leaderElection.namespace }}" }} {{ "{{ else }}" }} namespace: {{ "{{ .Release.Namespace }}" }} {{ "{{ end }}" }} + labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} rules: - apiGroups: - coordination.k8s.io diff --git a/templates/helm/templates/role-reader.yaml.tpl b/templates/helm/templates/role-reader.yaml.tpl index 39b369f3..b7de4568 100644 --- a/templates/helm/templates/role-reader.yaml.tpl +++ b/templates/helm/templates/role-reader.yaml.tpl @@ -3,8 +3,15 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: creationTimestamp: null - name: ack-{{ .ControllerName }}-reader + name: {{ IncludeTemplate "app.fullname" }}-reader namespace: {{ "{{ .Release.Namespace }}" }} + labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} rules: - apiGroups: - {{ .APIGroup }} diff --git a/templates/helm/templates/role-writer.yaml.tpl b/templates/helm/templates/role-writer.yaml.tpl index 6745ada7..4eadf20a 100644 --- a/templates/helm/templates/role-writer.yaml.tpl +++ b/templates/helm/templates/role-writer.yaml.tpl @@ -3,8 +3,15 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: creationTimestamp: null - name: ack-{{ .ControllerName }}-writer + name: {{ IncludeTemplate "app.fullname" }}-writer namespace: {{ "{{ .Release.Namespace }}" }} + labels: + app.kubernetes.io/name: {{ IncludeTemplate "app.name" }} + app.kubernetes.io/instance: {{ "{{ .Release.Name }}" }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ "{{ .Chart.AppVersion | quote }}" }} + k8s-app: {{ IncludeTemplate "app.name" }} + helm.sh/chart: {{ IncludeTemplate "chart.name-version" }} rules: - apiGroups: - {{ .APIGroup }}