Skip to content

Commit d2e73e7

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

File tree

10 files changed

+349
-276
lines changed

10 files changed

+349
-276
lines changed

‎addons/rds-chart/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: rds-chart
33
description: A Helm chart for the ACK service controller for Amazon Relational Database Service (RDS)
4-
version: 1.1.9
5-
appVersion: 1.1.9
4+
version: 1.1.10
5+
appVersion: 1.1.10
66
home: https://github.com/aws-controllers-k8s/rds-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

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

Lines changed: 2 additions & 2 deletions
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/rds-chart/templates/NOTES.txt‎

Lines changed: 1 addition & 1 deletion
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/rds-controller:1.1.9".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/rds-controller:1.1.10".
33

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

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

Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,256 @@ 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+
- ec2.services.k8s.aws
81+
resources:
82+
- securitygroups
83+
verbs:
84+
- get
85+
- list
86+
- apiGroups:
87+
- ec2.services.k8s.aws
88+
resources:
89+
- securitygroups/status
90+
verbs:
91+
- get
92+
- list
93+
- apiGroups:
94+
- ec2.services.k8s.aws
95+
resources:
96+
- subnets
97+
verbs:
98+
- get
99+
- list
100+
- apiGroups:
101+
- ec2.services.k8s.aws
102+
resources:
103+
- subnets/status
104+
verbs:
105+
- get
106+
- list
107+
- apiGroups:
108+
- kms.services.k8s.aws
109+
resources:
110+
- keys
111+
verbs:
112+
- get
113+
- list
114+
- apiGroups:
115+
- kms.services.k8s.aws
116+
resources:
117+
- keys/status
118+
verbs:
119+
- get
120+
- list
121+
- apiGroups:
122+
- rds.services.k8s.aws
123+
resources:
124+
- dbclusterparametergroups
125+
verbs:
126+
- create
127+
- delete
128+
- get
129+
- list
130+
- patch
131+
- update
132+
- watch
133+
- apiGroups:
134+
- rds.services.k8s.aws
135+
resources:
136+
- dbclusterparametergroups/status
137+
verbs:
138+
- get
139+
- patch
140+
- update
141+
- apiGroups:
142+
- rds.services.k8s.aws
143+
resources:
144+
- dbclusters
145+
verbs:
146+
- create
147+
- delete
148+
- get
149+
- list
150+
- patch
151+
- update
152+
- watch
153+
- apiGroups:
154+
- rds.services.k8s.aws
155+
resources:
156+
- dbclusters/status
157+
verbs:
158+
- get
159+
- patch
160+
- update
161+
- apiGroups:
162+
- rds.services.k8s.aws
163+
resources:
164+
- dbinstances
165+
verbs:
166+
- create
167+
- delete
168+
- get
169+
- list
170+
- patch
171+
- update
172+
- watch
173+
- apiGroups:
174+
- rds.services.k8s.aws
175+
resources:
176+
- dbinstances/status
177+
verbs:
178+
- get
179+
- patch
180+
- update
181+
- apiGroups:
182+
- rds.services.k8s.aws
183+
resources:
184+
- dbparametergroups
185+
verbs:
186+
- create
187+
- delete
188+
- get
189+
- list
190+
- patch
191+
- update
192+
- watch
193+
- apiGroups:
194+
- rds.services.k8s.aws
195+
resources:
196+
- dbparametergroups/status
197+
verbs:
198+
- get
199+
- patch
200+
- update
201+
- apiGroups:
202+
- rds.services.k8s.aws
203+
resources:
204+
- dbproxies
205+
verbs:
206+
- create
207+
- delete
208+
- get
209+
- list
210+
- patch
211+
- update
212+
- watch
213+
- apiGroups:
214+
- rds.services.k8s.aws
215+
resources:
216+
- dbproxies/status
217+
verbs:
218+
- get
219+
- patch
220+
- update
221+
- apiGroups:
222+
- rds.services.k8s.aws
223+
resources:
224+
- dbsubnetgroups
225+
verbs:
226+
- create
227+
- delete
228+
- get
229+
- list
230+
- patch
231+
- update
232+
- watch
233+
- apiGroups:
234+
- rds.services.k8s.aws
235+
resources:
236+
- dbsubnetgroups/status
237+
verbs:
238+
- get
239+
- patch
240+
- update
241+
- apiGroups:
242+
- rds.services.k8s.aws
243+
resources:
244+
- globalclusters
245+
verbs:
246+
- create
247+
- delete
248+
- get
249+
- list
250+
- patch
251+
- update
252+
- watch
253+
- apiGroups:
254+
- rds.services.k8s.aws
255+
resources:
256+
- globalclusters/status
257+
verbs:
258+
- get
259+
- patch
260+
- update
261+
- apiGroups:
262+
- services.k8s.aws
263+
resources:
264+
- adoptedresources
265+
verbs:
266+
- create
267+
- delete
268+
- get
269+
- list
270+
- patch
271+
- update
272+
- watch
273+
- apiGroups:
274+
- services.k8s.aws
275+
resources:
276+
- adoptedresources/status
277+
verbs:
278+
- get
279+
- patch
280+
- update
281+
- apiGroups:
282+
- services.k8s.aws
283+
resources:
284+
- fieldexports
285+
verbs:
286+
- create
287+
- delete
288+
- get
289+
- list
290+
- patch
291+
- update
292+
- watch
293+
- apiGroups:
294+
- services.k8s.aws
295+
resources:
296+
- fieldexports/status
297+
verbs:
298+
- get
299+
- patch
300+
- update
301+
{{- end }}

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

Lines changed: 26 additions & 0 deletions
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-rds-controller
5+
roleRef:
6+
kind: ClusterRole
7+
apiGroup: rbac.authorization.k8s.io
8+
name: ack-namespaces-cache-rds-controller
9+
subjects:
10+
- kind: ServiceAccount
11+
name: ack-rds-controller
12+
namespace: {{ .Release.Namespace }}
13+
---
14+
apiVersion: rbac.authorization.k8s.io/v1
15+
kind: RoleBinding
16+
metadata:
17+
name: ack-configmaps-cache-rds-controller
18+
namespace: {{ .Release.Namespace }}
19+
roleRef:
20+
kind: Role
21+
apiGroup: rbac.authorization.k8s.io
22+
name: ack-configmaps-cache-rds-controller
23+
subjects:
24+
- kind: ServiceAccount
25+
name: ack-rds-controller
26+
namespace: {{ .Release.Namespace }}

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

Lines changed: 28 additions & 0 deletions
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-rds-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-rds-controller
19+
namespace: {{ .Release.Namespace }}
20+
rules:
21+
- apiGroups:
22+
- ""
23+
resources:
24+
- configmaps
25+
verbs:
26+
- get
27+
- list
28+
- watch

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

Lines changed: 21 additions & 7 deletions
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-rds-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-rds-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)