Skip to content

Commit 659db8e

Browse files
sungurokusunguroku
authored
[create-pull-request] automated change
1 parent 64ea60c commit 659db8e

10 files changed

+207
-129
lines changed

‎addons/sfn-chart/Chart.yaml

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

‎addons/sfn-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/sfn-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/sfn-controller:1.0.6".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/sfn-controller:1.0.7".
33

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

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

+111
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,114 @@ 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+
- services.k8s.aws
81+
resources:
82+
- adoptedresources
83+
verbs:
84+
- create
85+
- delete
86+
- get
87+
- list
88+
- patch
89+
- update
90+
- watch
91+
- apiGroups:
92+
- services.k8s.aws
93+
resources:
94+
- adoptedresources/status
95+
verbs:
96+
- get
97+
- patch
98+
- update
99+
- apiGroups:
100+
- services.k8s.aws
101+
resources:
102+
- fieldexports
103+
verbs:
104+
- create
105+
- delete
106+
- get
107+
- list
108+
- patch
109+
- update
110+
- watch
111+
- apiGroups:
112+
- services.k8s.aws
113+
resources:
114+
- fieldexports/status
115+
verbs:
116+
- get
117+
- patch
118+
- update
119+
- apiGroups:
120+
- sfn.services.k8s.aws
121+
resources:
122+
- activities
123+
verbs:
124+
- create
125+
- delete
126+
- get
127+
- list
128+
- patch
129+
- update
130+
- watch
131+
- apiGroups:
132+
- sfn.services.k8s.aws
133+
resources:
134+
- activities/status
135+
verbs:
136+
- get
137+
- patch
138+
- update
139+
- apiGroups:
140+
- sfn.services.k8s.aws
141+
resources:
142+
- statemachines
143+
verbs:
144+
- create
145+
- delete
146+
- get
147+
- list
148+
- patch
149+
- update
150+
- watch
151+
- apiGroups:
152+
- sfn.services.k8s.aws
153+
resources:
154+
- statemachines/status
155+
verbs:
156+
- get
157+
- patch
158+
- update
159+
{{- end }}

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

‎addons/sfn-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-sfn-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-sfn-controller
19+
namespace: {{ .Release.Namespace }}
20+
rules:
21+
- apiGroups:
22+
- ""
23+
resources:
24+
- configmaps
25+
verbs:
26+
- get
27+
- list
28+
- watch

‎addons/sfn-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-sfn-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-sfn-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 }}

‎addons/sfn-chart/templates/cluster-role-controller.yaml

+14-114
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,28 @@
1-
apiVersion: rbac.authorization.k8s.io/v1
1+
{{ $labels := .Values.role.labels }}
2+
{{ $rules := include "controller-role-rules" . }}
23
{{ if eq .Values.installScope "cluster" }}
4+
apiVersion: rbac.authorization.k8s.io/v1
35
kind: ClusterRole
46
metadata:
5-
creationTimestamp: null
67
name: ack-sfn-controller
78
labels:
8-
{{- range $key, $value := .Values.role.labels }}
9+
{{- range $key, $value := $labels }}
910
{{ $key }}: {{ $value | quote }}
1011
{{- end }}
11-
{{ else }}
12+
{{- $rules }}
13+
{{ else if .Values.watchNamespace }}
14+
{{ $namespaces := split "," .Values.watchNamespace }}
15+
{{ range $namespaces }}
16+
---
17+
apiVersion: rbac.authorization.k8s.io/v1
1218
kind: Role
1319
metadata:
14-
creationTimestamp: null
1520
name: ack-sfn-controller
21+
namespace: {{ . }}
1622
labels:
17-
{{- range $key, $value := .Values.role.labels }}
23+
{{- range $key, $value := $labels }}
1824
{{ $key }}: {{ $value | quote }}
1925
{{- end }}
20-
namespace: {{ .Release.Namespace }}
26+
{{- $rules }}
2127
{{ end }}
22-
rules:
23-
- apiGroups:
24-
- ""
25-
resources:
26-
- configmaps
27-
verbs:
28-
- get
29-
- list
30-
- patch
31-
- watch
32-
- apiGroups:
33-
- ""
34-
resources:
35-
- namespaces
36-
verbs:
37-
- get
38-
- list
39-
- watch
40-
- apiGroups:
41-
- ""
42-
resources:
43-
- secrets
44-
verbs:
45-
- get
46-
- list
47-
- patch
48-
- watch
49-
- apiGroups:
50-
- services.k8s.aws
51-
resources:
52-
- adoptedresources
53-
verbs:
54-
- create
55-
- delete
56-
- get
57-
- list
58-
- patch
59-
- update
60-
- watch
61-
- apiGroups:
62-
- services.k8s.aws
63-
resources:
64-
- adoptedresources/status
65-
verbs:
66-
- get
67-
- patch
68-
- update
69-
- apiGroups:
70-
- services.k8s.aws
71-
resources:
72-
- fieldexports
73-
verbs:
74-
- create
75-
- delete
76-
- get
77-
- list
78-
- patch
79-
- update
80-
- watch
81-
- apiGroups:
82-
- services.k8s.aws
83-
resources:
84-
- fieldexports/status
85-
verbs:
86-
- get
87-
- patch
88-
- update
89-
- apiGroups:
90-
- sfn.services.k8s.aws
91-
resources:
92-
- activities
93-
verbs:
94-
- create
95-
- delete
96-
- get
97-
- list
98-
- patch
99-
- update
100-
- watch
101-
- apiGroups:
102-
- sfn.services.k8s.aws
103-
resources:
104-
- activities/status
105-
verbs:
106-
- get
107-
- patch
108-
- update
109-
- apiGroups:
110-
- sfn.services.k8s.aws
111-
resources:
112-
- statemachines
113-
verbs:
114-
- create
115-
- delete
116-
- get
117-
- list
118-
- patch
119-
- update
120-
- watch
121-
- apiGroups:
122-
- sfn.services.k8s.aws
123-
resources:
124-
- statemachines/status
125-
verbs:
126-
- get
127-
- patch
128-
- update
28+
{{ end }}

0 commit comments

Comments
 (0)