Skip to content

Commit 29e4fab

Browse files
michaelhtmmichaelhtm
committed
changes!!
1 parent a79a890 commit 29e4fab

File tree

9 files changed

+108
-21
lines changed

9 files changed

+108
-21
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2025-05-24T00:16:13Z"
3-
build_hash: 66a58d259146834e61b211a9a01609beaa58ef77
4-
go_version: go1.24.2
5-
version: v0.47.1
2+
build_date: "2025-05-30T19:18:58Z"
3+
build_hash: da78c1859faff7de93d1094ce8f26dc8b1fa5690
4+
go_version: go1.24.3
5+
version: v0.46.2-4-gda78c18
66
api_directory_checksum: 2627dc306e3a83c86c04050c6c4336451459e728
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.32.6

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

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-sqs-controller
4+
name: {{ include "ack-sqs-controller.app.fullname" . }}-namespace-caches
5+
labels:
6+
app.kubernetes.io/name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
11+
helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }}
512
roleRef:
613
kind: ClusterRole
714
apiGroup: rbac.authorization.k8s.io
8-
name: ack-namespaces-cache-sqs-controller
15+
name: {{ include "ack-sqs-controller.app.fullname" . }}-namespace-caches
916
subjects:
1017
- kind: ServiceAccount
1118
name: {{ include "ack-sqs-controller.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-sqs-controller
24+
name: {{ include "ack-sqs-controller.app.fullname" . }}-configmaps-cache
1825
namespace: {{ .Release.Namespace }}
26+
labels:
27+
app.kubernetes.io/name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
32+
helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }}
1933
roleRef:
2034
kind: Role
2135
apiGroup: rbac.authorization.k8s.io
22-
name: ack-configmaps-cache-sqs-controller
36+
name: {{ include "ack-sqs-controller.app.fullname" . }}-configmaps-cache
2337
subjects:
2438
- kind: ServiceAccount
2539
name: {{ include "ack-sqs-controller.service-account.name" . }}

‎helm/templates/caches-role.yaml‎

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-sqs-controller
4+
name: {{ include "ack-sqs-controller.app.fullname" . }}-namespaces-cache
5+
labels:
6+
app.kubernetes.io/name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
11+
helm.sh/chart: {{ include "ack-sqs-controller.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-sqs-controller
25+
name: {{ include "ack-sqs-controller.app.fullname" . }}-configmaps-cache
1926
namespace: {{ .Release.Namespace }}
27+
labels:
28+
app.kubernetes.io/name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
33+
helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }}
2034
rules:
2135
- apiGroups:
2236
- ""

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

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: {{ include "ack-sqs-controller.app.fullname" . }}
5+
name: {{ include "ack-sqs-controller.app.fullname" . }}-rolebinding
6+
labels:
7+
app.kubernetes.io/name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
12+
helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }}
613
roleRef:
714
kind: ClusterRole
815
apiGroup: rbac.authorization.k8s.io
9-
name: ack-sqs-controller
16+
name: {{ include "ack-sqs-controller.app.fullname" . }}
1017
subjects:
1118
- kind: ServiceAccount
1219
name: {{ include "ack-sqs-controller.service-account.name" . }}
@@ -17,17 +24,26 @@ subjects:
1724
{{ $fullname := include "ack-sqs-controller.app.fullname" . }}
1825
{{ $releaseNamespace := .Release.Namespace }}
1926
{{ $serviceAccountName := include "ack-sqs-controller.service-account.name" . }}
27+
{{ $chartVersion := include "ack-sqs-controller.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-sqs-controller
46+
name: {{ $fullname }}-{{ . }}
3147
subjects:
3248
- kind: ServiceAccount
3349
name: {{ $serviceAccountName }}

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

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
{{ $rbacRules := include "ack-sqs-controller.rbac-rules" . }}
4+
{{ $fullname := include "ack-sqs-controller.app.fullname" . }}
5+
{{ $chartVersion := include "ack-sqs-controller.chart.name-version" . }}
36
{{ if eq .Values.installScope "cluster" }}
47
apiVersion: rbac.authorization.k8s.io/v1
58
kind: ClusterRole
69
metadata:
7-
name: ack-sqs-controller
10+
name: {{ include "ack-sqs-controller.app.fullname" . }}
811
labels:
12+
app.kubernetes.io/name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
17+
helm.sh/chart: {{ include "ack-sqs-controller.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-sqs-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 }}

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

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: sqs-leader-election-rolebinding
5+
name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
17+
helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }}
1118
roleRef:
1219
apiGroup: rbac.authorization.k8s.io
1320
kind: Role
14-
name: sqs-leader-election-role
21+
name: {{ include "ack-sqs-controller.app.fullname" . }}-leaderelection
1522
subjects:
1623
- kind: ServiceAccount
1724
name: {{ include "ack-sqs-controller.service-account.name" . }}

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

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: sqs-leader-election-role
5+
name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
17+
helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }}
1118
rules:
1219
- apiGroups:
1320
- coordination.k8s.io

‎helm/templates/role-reader.yaml‎

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-sqs-reader
6+
name: {{ include "ack-sqs-controller.app.fullname" . }}-reader
77
namespace: {{ .Release.Namespace }}
8+
labels:
9+
app.kubernetes.io/name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
14+
helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }}
815
rules:
916
- apiGroups:
1017
- sqs.services.k8s.aws

‎helm/templates/role-writer.yaml‎

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-sqs-writer
6+
name: {{ include "ack-sqs-controller.app.fullname" . }}-writer
77
namespace: {{ .Release.Namespace }}
8+
labels:
9+
app.kubernetes.io/name: {{ include "ack-sqs-controller.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: {{ include "ack-sqs-controller.app.name" . }}
14+
helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }}
815
rules:
916
- apiGroups:
1017
- sqs.services.k8s.aws

0 commit comments

Comments
 (0)