Skip to content

Commit

Permalink
Update to ACK runtime v0.39.0, code-generator v0.39.1 (#72)
Browse files Browse the repository at this point in the history
### 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.
  • Loading branch information
ack-bot authored Oct 12, 2024
1 parent 6df3f52 commit 6ead6dc
Show file tree
Hide file tree
Showing 18 changed files with 127 additions and 269 deletions.
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2024-08-29T17:08:24Z"
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
go_version: go1.22.5
version: v0.38.1
build_date: "2024-10-10T04:05:50Z"
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
go_version: go1.23.2
version: v0.39.1
api_directory_checksum: 679e5320c1786c482397c54c97a2bbe9054d2e5f
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
Expand Down
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/sfn-controller
newTag: 1.0.14
newTag: 1.0.15
14 changes: 1 addition & 13 deletions config/crd/bases/sfn.services.k8s.aws_activities.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: activities.sfn.services.k8s.aws
spec:
group: sfn.services.k8s.aws
Expand Down Expand Up @@ -46,53 +46,42 @@ spec:
to State Machine Executions (https://docs.aws.amazon.com/step-functions/latest/dg/limits.html#service-limits-state-machine-executions)
in the AWS Step Functions Developer Guide.
A name must not contain:
* white space
* brackets < > { } [ ]
* wildcard characters ? *
* special characters " # % \ ^ | ~ ` $ & , ; : /
* control characters (U+0000-001F, U+007F-009F)
To enable logging with CloudWatch Logs, the name should only contain 0-9,
A-Z, a-z, - and _.
type: string
tags:
description: |-
The list of tags to add to a resource.
An array of key-value pairs. For more information, see Using Cost Allocation
Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html)
in the AWS Billing and Cost Management User Guide, and Controlling Access
Using IAM Tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_iam-tags.html).
Tags may only contain Unicode letters, digits, white space, or these symbols:
_ . : / = + - @.
items:
description: |-
Tags are key-value pairs that can be associated with Step Functions state
machines and activities.
An array of key-value pairs. For more information, see Using Cost Allocation
Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html)
in the AWS Billing and Cost Management User Guide, and Controlling Access
Using IAM Tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_iam-tags.html).
Tags may only contain Unicode letters, digits, white space, or these symbols:
_ . : / = + - @.
properties:
Expand Down Expand Up @@ -122,7 +111,6 @@ spec:
when it has verified that an "adopted" resource (a resource where the
ARN annotation was set by the Kubernetes user on the CR) exists and
matches the supplied CR's Spec field values.
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
https://github.com/aws/aws-controllers-k8s/issues/270
type: string
ownerAccountID:
Expand Down
15 changes: 1 addition & 14 deletions config/crd/bases/sfn.services.k8s.aws_statemachines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: statemachines.sfn.services.k8s.aws
spec:
group: sfn.services.k8s.aws
Expand Down Expand Up @@ -48,7 +48,6 @@ spec:
description: |-
Defines what execution history events are logged and where they are logged.
By default, the level is set to OFF. For more information see Log Levels
(https://docs.aws.amazon.com/step-functions/latest/dg/cloudwatch-log-level.html)
in the AWS Step Functions User Guide.
Expand All @@ -72,25 +71,18 @@ spec:
description: |-
The name of the state machine.
A name must not contain:
* white space
* brackets < > { } [ ]
* wildcard characters ? *
* special characters " # % \ ^ | ~ ` $ & , ; : /
* control characters (U+0000-001F, U+007F-009F)
To enable logging with CloudWatch Logs, the name should only contain 0-9,
A-Z, a-z, - and _.
type: string
Expand All @@ -102,27 +94,23 @@ spec:
description: |-
Tags to be added when creating a state machine.
An array of key-value pairs. For more information, see Using Cost Allocation
Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html)
in the AWS Billing and Cost Management User Guide, and Controlling Access
Using IAM Tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_iam-tags.html).
Tags may only contain Unicode letters, digits, white space, or these symbols:
_ . : / = + - @.
items:
description: |-
Tags are key-value pairs that can be associated with Step Functions state
machines and activities.
An array of key-value pairs. For more information, see Using Cost Allocation
Tags (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html)
in the AWS Billing and Cost Management User Guide, and Controlling Access
Using IAM Tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_iam-tags.html).
Tags may only contain Unicode letters, digits, white space, or these symbols:
_ . : / = + - @.
properties:
Expand Down Expand Up @@ -166,7 +154,6 @@ spec:
when it has verified that an "adopted" resource (a resource where the
ARN annotation was set by the Kubernetes user on the CR) exists and
matches the supplied CR's Spec field values.
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
https://github.com/aws/aws-controllers-k8s/issues/270
type: string
ownerAccountID:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: adoptedresources.services.k8s.aws
spec:
group: services.k8s.aws
Expand Down Expand Up @@ -78,11 +78,9 @@ spec:
automatically converts this to an arbitrary string-string map.
https://github.com/kubernetes-sigs/controller-tools/issues/385
Active discussion about inclusion of this field in the spec is happening in this PR:
https://github.com/kubernetes-sigs/controller-tools/pull/395
Until this is allowed, or if it never is, we will produce a subset of the object meta
that contains only the fields which the user is allowed to modify in the metadata.
properties:
Expand All @@ -105,13 +103,11 @@ spec:
and may be truncated by the length of the suffix required to make the value
unique on the server.
If this field is specified and the generated name exists, the server will
NOT return a 409 - instead, it will either return 201 Created or 500 with Reason
ServerTimeout indicating a unique name could not be found in the time allotted, and the client
should retry (optionally after the time indicated in the Retry-After header).
Applied only if Name is not specified.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
type: string
Expand Down Expand Up @@ -140,7 +136,6 @@ spec:
Not all objects are required to be scoped to a namespace - the value of this field for
those objects will be empty.
Must be a DNS_LABEL.
Cannot be updated.
More info: http://kubernetes.io/docs/user-guide/namespaces
Expand Down
2 changes: 1 addition & 1 deletion config/crd/common/bases/services.k8s.aws_fieldexports.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: fieldexports.services.k8s.aws
spec:
group: services.k8s.aws
Expand Down
50 changes: 3 additions & 47 deletions config/rbac/cluster-role-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ rules:
- ""
resources:
- configmaps
- secrets
verbs:
- get
- list
Expand All @@ -21,38 +22,10 @@ rules:
- get
- list
- watch
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- patch
- watch
- apiGroups:
- services.k8s.aws
resources:
- adoptedresources
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- services.k8s.aws
resources:
- adoptedresources/status
verbs:
- get
- patch
- update
- apiGroups:
- services.k8s.aws
resources:
- fieldexports
verbs:
- create
Expand All @@ -65,6 +38,7 @@ rules:
- apiGroups:
- services.k8s.aws
resources:
- adoptedresources/status
- fieldexports/status
verbs:
- get
Expand All @@ -74,25 +48,6 @@ rules:
- sfn.services.k8s.aws
resources:
- activities
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- sfn.services.k8s.aws
resources:
- activities/status
verbs:
- get
- patch
- update
- apiGroups:
- sfn.services.k8s.aws
resources:
- statemachines
verbs:
- create
Expand All @@ -105,6 +60,7 @@ rules:
- apiGroups:
- sfn.services.k8s.aws
resources:
- activities/status
- statemachines/status
verbs:
- get
Expand Down
Loading

0 comments on commit 6ead6dc

Please sign in to comment.