Skip to content

Commit 6ead6dc

Browse files
authored
Update to ACK runtime v0.39.0, code-generator v0.39.1 (#72)
### Update to ACK runtime `v0.39.0`, code-generator `v0.39.1` ---------- * ACK code-generator `v0.39.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.39.1) * ACK runtime `v0.39.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.39.0) ---------- NOTE: This PR increments the release version of service controller from `v1.0.14` to `v1.0.15` Once this PR is merged, release `v1.0.15` will be automatically created for `sfn-controller` **Please close this PR, if you do not want the new patch release for `sfn-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building sfn-controller ==== Copying common custom resource definitions into sfn Building Kubernetes API objects for sfn Generating deepcopy code for sfn Generating custom resource definitions for sfn Building service controller for sfn Generating RBAC manifests for sfn Running gofmt against generated code for sfn Updating additional GitHub repository maintenance files ==== building sfn-controller release artifacts ==== Building release artifacts for sfn-v1.0.15 Generating common custom resource definitions Generating custom resource definitions for sfn Generating RBAC manifests for sfn ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 6df3f52 commit 6ead6dc

18 files changed

+127
-269
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: "2024-08-29T17:08:24Z"
3-
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
4-
go_version: go1.22.5
5-
version: v0.38.1
2+
build_date: "2024-10-10T04:05:50Z"
3+
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
4+
go_version: go1.23.2
5+
version: v0.39.1
66
api_directory_checksum: 679e5320c1786c482397c54c97a2bbe9054d2e5f
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

config/controller/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ kind: Kustomization
66
images:
77
- name: controller
88
newName: public.ecr.aws/aws-controllers-k8s/sfn-controller
9-
newTag: 1.0.14
9+
newTag: 1.0.15

config/crd/bases/sfn.services.k8s.aws_activities.yaml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: activities.sfn.services.k8s.aws
88
spec:
99
group: sfn.services.k8s.aws
@@ -46,53 +46,42 @@ spec:
4646
to State Machine Executions (https://docs.aws.amazon.com/step-functions/latest/dg/limits.html#service-limits-state-machine-executions)
4747
in the AWS Step Functions Developer Guide.
4848
49-
5049
A name must not contain:
5150
52-
5351
* white space
5452
55-
5653
* brackets < > { } [ ]
5754
58-
5955
* wildcard characters ? *
6056
61-
6257
* special characters " # % \ ^ | ~ ` $ & , ; : /
6358
64-
6559
* control characters (U+0000-001F, U+007F-009F)
6660
67-
6861
To enable logging with CloudWatch Logs, the name should only contain 0-9,
6962
A-Z, a-z, - and _.
7063
type: string
7164
tags:
7265
description: |-
7366
The list of tags to add to a resource.
7467
75-
7668
An array of key-value pairs. For more information, see Using Cost Allocation
7769
Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html)
7870
in the AWS Billing and Cost Management User Guide, and Controlling Access
7971
Using IAM Tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_iam-tags.html).
8072
81-
8273
Tags may only contain Unicode letters, digits, white space, or these symbols:
8374
_ . : / = + - @.
8475
items:
8576
description: |-
8677
Tags are key-value pairs that can be associated with Step Functions state
8778
machines and activities.
8879
89-
9080
An array of key-value pairs. For more information, see Using Cost Allocation
9181
Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html)
9282
in the AWS Billing and Cost Management User Guide, and Controlling Access
9383
Using IAM Tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_iam-tags.html).
9484
95-
9685
Tags may only contain Unicode letters, digits, white space, or these symbols:
9786
_ . : / = + - @.
9887
properties:
@@ -122,7 +111,6 @@ spec:
122111
when it has verified that an "adopted" resource (a resource where the
123112
ARN annotation was set by the Kubernetes user on the CR) exists and
124113
matches the supplied CR's Spec field values.
125-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
126114
https://github.com/aws/aws-controllers-k8s/issues/270
127115
type: string
128116
ownerAccountID:

config/crd/bases/sfn.services.k8s.aws_statemachines.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: statemachines.sfn.services.k8s.aws
88
spec:
99
group: sfn.services.k8s.aws
@@ -48,7 +48,6 @@ spec:
4848
description: |-
4949
Defines what execution history events are logged and where they are logged.
5050
51-
5251
By default, the level is set to OFF. For more information see Log Levels
5352
(https://docs.aws.amazon.com/step-functions/latest/dg/cloudwatch-log-level.html)
5453
in the AWS Step Functions User Guide.
@@ -72,25 +71,18 @@ spec:
7271
description: |-
7372
The name of the state machine.
7473
75-
7674
A name must not contain:
7775
78-
7976
* white space
8077
81-
8278
* brackets < > { } [ ]
8379
84-
8580
* wildcard characters ? *
8681
87-
8882
* special characters " # % \ ^ | ~ ` $ & , ; : /
8983
90-
9184
* control characters (U+0000-001F, U+007F-009F)
9285
93-
9486
To enable logging with CloudWatch Logs, the name should only contain 0-9,
9587
A-Z, a-z, - and _.
9688
type: string
@@ -102,27 +94,23 @@ spec:
10294
description: |-
10395
Tags to be added when creating a state machine.
10496
105-
10697
An array of key-value pairs. For more information, see Using Cost Allocation
10798
Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html)
10899
in the AWS Billing and Cost Management User Guide, and Controlling Access
109100
Using IAM Tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_iam-tags.html).
110101
111-
112102
Tags may only contain Unicode letters, digits, white space, or these symbols:
113103
_ . : / = + - @.
114104
items:
115105
description: |-
116106
Tags are key-value pairs that can be associated with Step Functions state
117107
machines and activities.
118108
119-
120109
An array of key-value pairs. For more information, see Using Cost Allocation
121110
Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html)
122111
in the AWS Billing and Cost Management User Guide, and Controlling Access
123112
Using IAM Tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_iam-tags.html).
124113
125-
126114
Tags may only contain Unicode letters, digits, white space, or these symbols:
127115
_ . : / = + - @.
128116
properties:
@@ -166,7 +154,6 @@ spec:
166154
when it has verified that an "adopted" resource (a resource where the
167155
ARN annotation was set by the Kubernetes user on the CR) exists and
168156
matches the supplied CR's Spec field values.
169-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
170157
https://github.com/aws/aws-controllers-k8s/issues/270
171158
type: string
172159
ownerAccountID:

config/crd/common/bases/services.k8s.aws_adoptedresources.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: adoptedresources.services.k8s.aws
88
spec:
99
group: services.k8s.aws
@@ -78,11 +78,9 @@ spec:
7878
automatically converts this to an arbitrary string-string map.
7979
https://github.com/kubernetes-sigs/controller-tools/issues/385
8080
81-
8281
Active discussion about inclusion of this field in the spec is happening in this PR:
8382
https://github.com/kubernetes-sigs/controller-tools/pull/395
8483
85-
8684
Until this is allowed, or if it never is, we will produce a subset of the object meta
8785
that contains only the fields which the user is allowed to modify in the metadata.
8886
properties:
@@ -105,13 +103,11 @@ spec:
105103
and may be truncated by the length of the suffix required to make the value
106104
unique on the server.
107105
108-
109106
If this field is specified and the generated name exists, the server will
110107
NOT return a 409 - instead, it will either return 201 Created or 500 with Reason
111108
ServerTimeout indicating a unique name could not be found in the time allotted, and the client
112109
should retry (optionally after the time indicated in the Retry-After header).
113110
114-
115111
Applied only if Name is not specified.
116112
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
117113
type: string
@@ -140,7 +136,6 @@ spec:
140136
Not all objects are required to be scoped to a namespace - the value of this field for
141137
those objects will be empty.
142138
143-
144139
Must be a DNS_LABEL.
145140
Cannot be updated.
146141
More info: http://kubernetes.io/docs/user-guide/namespaces

config/crd/common/bases/services.k8s.aws_fieldexports.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: fieldexports.services.k8s.aws
88
spec:
99
group: services.k8s.aws

config/rbac/cluster-role-controller.yaml

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ rules:
88
- ""
99
resources:
1010
- configmaps
11+
- secrets
1112
verbs:
1213
- get
1314
- list
@@ -21,38 +22,10 @@ rules:
2122
- get
2223
- list
2324
- watch
24-
- apiGroups:
25-
- ""
26-
resources:
27-
- secrets
28-
verbs:
29-
- get
30-
- list
31-
- patch
32-
- watch
3325
- apiGroups:
3426
- services.k8s.aws
3527
resources:
3628
- adoptedresources
37-
verbs:
38-
- create
39-
- delete
40-
- get
41-
- list
42-
- patch
43-
- update
44-
- watch
45-
- apiGroups:
46-
- services.k8s.aws
47-
resources:
48-
- adoptedresources/status
49-
verbs:
50-
- get
51-
- patch
52-
- update
53-
- apiGroups:
54-
- services.k8s.aws
55-
resources:
5629
- fieldexports
5730
verbs:
5831
- create
@@ -65,6 +38,7 @@ rules:
6538
- apiGroups:
6639
- services.k8s.aws
6740
resources:
41+
- adoptedresources/status
6842
- fieldexports/status
6943
verbs:
7044
- get
@@ -74,25 +48,6 @@ rules:
7448
- sfn.services.k8s.aws
7549
resources:
7650
- activities
77-
verbs:
78-
- create
79-
- delete
80-
- get
81-
- list
82-
- patch
83-
- update
84-
- watch
85-
- apiGroups:
86-
- sfn.services.k8s.aws
87-
resources:
88-
- activities/status
89-
verbs:
90-
- get
91-
- patch
92-
- update
93-
- apiGroups:
94-
- sfn.services.k8s.aws
95-
resources:
9651
- statemachines
9752
verbs:
9853
- create
@@ -105,6 +60,7 @@ rules:
10560
- apiGroups:
10661
- sfn.services.k8s.aws
10762
resources:
63+
- activities/status
10864
- statemachines/status
10965
verbs:
11066
- get

0 commit comments

Comments
 (0)