Skip to content

Commit 57eb7eb

Browse files
d-g-townd-g-town
authored
[create-pull-request] automated change
1 parent 394e2f2 commit 57eb7eb

10 files changed

+215
-136
lines changed

‎addons/sqs-chart/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: sqs-chart
33
description: A Helm chart for the ACK service controller for Amazon Simple Queue Service (SQS)
4-
version: 1.0.7
5-
appVersion: 1.0.7
4+
version: 1.0.8
5+
appVersion: 1.0.8
66
home: https://github.com/aws-controllers-k8s/sqs-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎addons/sqs-chart/crds/services.k8s.aws_adoptedresources.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ spec:
161161
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
162162
type: string
163163
name:
164-
description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
164+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names'
165165
type: string
166166
uid:
167-
description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
167+
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids'
168168
type: string
169169
required:
170170
- apiVersion

‎addons/sqs-chart/templates/NOTES.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ .Chart.Name }} has been installed.
2-
This chart deploys "public.ecr.aws/aws-controllers-k8s/sqs-controller:1.0.7".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/sqs-controller:1.0.8".
33

44
Check its status by running:
55
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

‎addons/sqs-chart/templates/_helpers.tpl

+119
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,122 @@ If release name contains chart name it will be used as a full name.
4646
{{- define "aws.credentials.path" -}}
4747
{{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}}
4848
{{- end -}}
49+
50+
{{/* The rules a of ClusterRole or Role */}}
51+
{{- define "controller-role-rules" }}
52+
rules:
53+
- apiGroups:
54+
- ""
55+
resources:
56+
- configmaps
57+
verbs:
58+
- get
59+
- list
60+
- patch
61+
- watch
62+
- apiGroups:
63+
- ""
64+
resources:
65+
- namespaces
66+
verbs:
67+
- get
68+
- list
69+
- watch
70+
- apiGroups:
71+
- ""
72+
resources:
73+
- secrets
74+
verbs:
75+
- get
76+
- list
77+
- patch
78+
- watch
79+
- apiGroups:
80+
- iam.services.k8s.aws
81+
resources:
82+
- policies
83+
verbs:
84+
- get
85+
- list
86+
- apiGroups:
87+
- iam.services.k8s.aws
88+
resources:
89+
- policies/status
90+
verbs:
91+
- get
92+
- list
93+
- apiGroups:
94+
- kms.services.k8s.aws
95+
resources:
96+
- keys
97+
verbs:
98+
- get
99+
- list
100+
- apiGroups:
101+
- kms.services.k8s.aws
102+
resources:
103+
- keys/status
104+
verbs:
105+
- get
106+
- list
107+
- apiGroups:
108+
- services.k8s.aws
109+
resources:
110+
- adoptedresources
111+
verbs:
112+
- create
113+
- delete
114+
- get
115+
- list
116+
- patch
117+
- update
118+
- watch
119+
- apiGroups:
120+
- services.k8s.aws
121+
resources:
122+
- adoptedresources/status
123+
verbs:
124+
- get
125+
- patch
126+
- update
127+
- apiGroups:
128+
- services.k8s.aws
129+
resources:
130+
- fieldexports
131+
verbs:
132+
- create
133+
- delete
134+
- get
135+
- list
136+
- patch
137+
- update
138+
- watch
139+
- apiGroups:
140+
- services.k8s.aws
141+
resources:
142+
- fieldexports/status
143+
verbs:
144+
- get
145+
- patch
146+
- update
147+
- apiGroups:
148+
- sqs.services.k8s.aws
149+
resources:
150+
- queues
151+
verbs:
152+
- create
153+
- delete
154+
- get
155+
- list
156+
- patch
157+
- update
158+
- watch
159+
- apiGroups:
160+
- sqs.services.k8s.aws
161+
resources:
162+
- queues/status
163+
verbs:
164+
- get
165+
- patch
166+
- update
167+
{{- end }}

‎addons/sqs-chart/templates/caches-role-binding.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRoleBinding
3+
metadata:
4+
name: ack-namespaces-cache-sqs-controller
5+
roleRef:
6+
kind: ClusterRole
7+
apiGroup: rbac.authorization.k8s.io
8+
name: ack-namespaces-cache-sqs-controller
9+
subjects:
10+
- kind: ServiceAccount
11+
name: ack-sqs-controller
12+
namespace: {{ .Release.Namespace }}
13+
---
14+
apiVersion: rbac.authorization.k8s.io/v1
15+
kind: RoleBinding
16+
metadata:
17+
name: ack-configmaps-cache-sqs-controller
18+
namespace: {{ .Release.Namespace }}
19+
roleRef:
20+
kind: Role
21+
apiGroup: rbac.authorization.k8s.io
22+
name: ack-configmaps-cache-sqs-controller
23+
subjects:
24+
- kind: ServiceAccount
25+
name: ack-sqs-controller
26+
namespace: {{ .Release.Namespace }}

‎addons/sqs-chart/templates/caches-role.yaml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
3+
metadata:
4+
name: ack-namespaces-cache-sqs-controller
5+
rules:
6+
- apiGroups:
7+
- ""
8+
resources:
9+
- namespaces
10+
verbs:
11+
- get
12+
- list
13+
- watch
14+
---
15+
apiVersion: rbac.authorization.k8s.io/v1
16+
kind: Role
17+
metadata:
18+
name: ack-configmaps-cache-sqs-controller
19+
namespace: {{ .Release.Namespace }}
20+
rules:
21+
- apiGroups:
22+
- ""
23+
resources:
24+
- configmaps
25+
verbs:
26+
- get
27+
- list
28+
- watch

‎addons/sqs-chart/templates/cluster-role-binding.yaml

+21-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
1-
apiVersion: rbac.authorization.k8s.io/v1
21
{{ if eq .Values.installScope "cluster" }}
2+
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: {{ include "app.fullname" . }}
66
roleRef:
77
kind: ClusterRole
8-
{{ else }}
8+
apiGroup: rbac.authorization.k8s.io
9+
name: ack-sqs-controller
10+
subjects:
11+
- kind: ServiceAccount
12+
name: {{ include "service-account.name" . }}
13+
namespace: {{ .Release.Namespace }}
14+
{{ else if .Values.watchNamespace }}
15+
{{ $namespaces := split "," .Values.watchNamespace }}
16+
{{ $fullname := include "app.fullname" . }}
17+
{{ $releaseNamespace := .Release.Namespace }}
18+
{{ $serviceAccountName := include "service-account.name" . }}
19+
{{ range $namespaces }}
20+
---
21+
apiVersion: rbac.authorization.k8s.io/v1
922
kind: RoleBinding
1023
metadata:
11-
name: {{ include "app.fullname" . }}
12-
namespace: {{ .Release.Namespace }}
24+
name: {{ $fullname }}
25+
namespace: {{ . }}
1326
roleRef:
1427
kind: Role
15-
{{ end }}
1628
apiGroup: rbac.authorization.k8s.io
1729
name: ack-sqs-controller
1830
subjects:
1931
- kind: ServiceAccount
20-
name: {{ include "service-account.name" . }}
21-
namespace: {{ .Release.Namespace }}
32+
name: {{ $serviceAccountName }}
33+
namespace: {{ $releaseNamespace }}
34+
{{ end }}
35+
{{ end }}

0 commit comments

Comments
 (0)