Skip to content

Commit

Permalink
Update to ACK runtime v0.20.1, code-generator v0.20.1 (#35)
Browse files Browse the repository at this point in the history
### Update to ACK runtime `v0.20.1`, code-generator `v0.20.1`

----------

* ACK code-generator `v0.20.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.20.1)
* ACK runtime `v0.20.1` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.20.1)

----------

NOTE:
This PR increments the release version of service controller from `v0.1.1` to `v0.1.2`

Once this PR is merged, release `v0.1.2` 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.
installing controller-gen v0.9.2 ... 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-v0.1.2
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 Sep 12, 2022
1 parent 78d4818 commit 55f67e4
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 91 deletions.
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
ack_generate_info:
build_date: "2022-09-06T12:57:05Z"
build_hash: 585f06bbd6d4cc1b738acb85901e7a009bf452c7
build_date: "2022-09-12T19:19:08Z"
build_hash: 2944c8772f216656d84ee02d392eaca501274c1e
go_version: go1.17.5
version: v0.20.0
version: v0.20.1
api_directory_checksum: fb0d67de142257cc8f80703c3f14eabbd87711b7
api_version: v1alpha1
aws_sdk_go_version: v1.42.0
aws_sdk_go_version: v1.44.93
generator_config_info:
file_checksum: 454d0d8e87016dbb4b53955ac467217940f4f265
original_file_name: generator.yaml
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: v0.1.1
newTag: v0.1.2
19 changes: 6 additions & 13 deletions config/crd/bases/sfn.services.k8s.aws_activities.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: activities.sfn.services.k8s.aws
spec:
Expand Down Expand Up @@ -41,11 +40,11 @@ spec:
unique for your AWS account and region for 90 days. For more information,
see Limits Related 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. \n A name must not contain:
\n * white space \n * brackets < > { } [ ] \n * wildcard
characters ? * \n * special characters \" # % \\ ^ | ~ ` $ &
, ; : / \n * control characters (U+0000-001F, U+007F-009F) \n
To enable logging with CloudWatch Logs, the name should only contain
0-9, A-Z, a-z, - and _."
\n * white space \n * brackets < > { } [ ] \n * wildcard characters
? * \n * special characters \" # % \\ ^ | ~ ` $ & , ; : / \n * control
characters (U+0000-001F, U+007F-009F) \n 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. \n An array of
Expand Down Expand Up @@ -147,9 +146,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
19 changes: 6 additions & 13 deletions config/crd/bases/sfn.services.k8s.aws_statemachines.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: statemachines.sfn.services.k8s.aws
spec:
Expand Down Expand Up @@ -63,11 +62,11 @@ spec:
type: object
name:
description: "The name of the state machine. \n A name must not contain:
\n * white space \n * brackets < > { } [ ] \n * wildcard
characters ? * \n * special characters \" # % \\ ^ | ~ ` $ &
, ; : / \n * control characters (U+0000-001F, U+007F-009F) \n
To enable logging with CloudWatch Logs, the name should only contain
0-9, A-Z, a-z, - and _."
\n * white space \n * brackets < > { } [ ] \n * wildcard characters
? * \n * special characters \" # % \\ ^ | ~ ` $ & , ; : / \n * control
characters (U+0000-001F, U+007F-009F) \n To enable logging with
CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and
_."
type: string
roleARN:
description: The Amazon Resource Name (ARN) of the IAM role to use
Expand Down Expand Up @@ -186,9 +185,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
1 change: 0 additions & 1 deletion config/rbac/cluster-role-controller.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/aws-controllers-k8s/sfn-controller
go 1.17

require (
github.com/aws-controllers-k8s/runtime v0.20.0
github.com/aws/aws-sdk-go v1.42.0
github.com/aws-controllers-k8s/runtime v0.20.1
github.com/aws/aws-sdk-go v1.44.93
github.com/go-logr/logr v1.2.0
github.com/spf13/pflag v1.0.5
k8s.io/api v0.23.0
Expand Down Expand Up @@ -46,10 +46,10 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
Expand Down
18 changes: 10 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/aws-controllers-k8s/runtime v0.20.0 h1:W91KYhjc+AvMhxguJTs3P5ZbkI6DUDzLdhL9pMjBxZE=
github.com/aws-controllers-k8s/runtime v0.20.0/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
github.com/aws/aws-sdk-go v1.42.0 h1:BMZws0t8NAhHFsfnT3B40IwD13jVDG5KerlRksctVIw=
github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/aws-controllers-k8s/runtime v0.20.1 h1:L/Huf1shRahx5BqJBCSS5u+vYg3f0Rotsq1jutORpdI=
github.com/aws-controllers-k8s/runtime v0.20.1/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
github.com/aws/aws-sdk-go v1.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8=
github.com/aws/aws-sdk-go v1.44.93/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
Expand Down Expand Up @@ -600,10 +600,10 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -695,11 +695,13 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc=
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: sfn-chart
description: A Helm chart for the ACK service controller for AWS Step Functions (Step-Functions)
version: v0.1.1
appVersion: v0.1.1
version: v0.1.2
appVersion: v0.1.2
home: https://github.com/aws-controllers-k8s/sfn-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
10 changes: 2 additions & 8 deletions helm/crds/services.k8s.aws_adoptedresources.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: adoptedresources.services.k8s.aws
spec:
Expand Down Expand Up @@ -170,6 +169,7 @@ spec:
- name
- uid
type: object
x-kubernetes-map-type: atomic
type: array
type: object
required:
Expand Down Expand Up @@ -224,9 +224,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
9 changes: 1 addition & 8 deletions helm/crds/services.k8s.aws_fieldexports.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: fieldexports.services.k8s.aws
spec:
Expand Down Expand Up @@ -133,9 +132,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
19 changes: 6 additions & 13 deletions helm/crds/sfn.services.k8s.aws_activities.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: activities.sfn.services.k8s.aws
spec:
Expand Down Expand Up @@ -41,11 +40,11 @@ spec:
unique for your AWS account and region for 90 days. For more information,
see Limits Related 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. \n A name must not contain:
\n * white space \n * brackets < > { } [ ] \n * wildcard
characters ? * \n * special characters \" # % \\ ^ | ~ ` $ &
, ; : / \n * control characters (U+0000-001F, U+007F-009F) \n
To enable logging with CloudWatch Logs, the name should only contain
0-9, A-Z, a-z, - and _."
\n * white space \n * brackets < > { } [ ] \n * wildcard characters
? * \n * special characters \" # % \\ ^ | ~ ` $ & , ; : / \n * control
characters (U+0000-001F, U+007F-009F) \n 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. \n An array of
Expand Down Expand Up @@ -147,9 +146,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
19 changes: 6 additions & 13 deletions helm/crds/sfn.services.k8s.aws_statemachines.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: statemachines.sfn.services.k8s.aws
spec:
Expand Down Expand Up @@ -63,11 +62,11 @@ spec:
type: object
name:
description: "The name of the state machine. \n A name must not contain:
\n * white space \n * brackets < > { } [ ] \n * wildcard
characters ? * \n * special characters \" # % \\ ^ | ~ ` $ &
, ; : / \n * control characters (U+0000-001F, U+007F-009F) \n
To enable logging with CloudWatch Logs, the name should only contain
0-9, A-Z, a-z, - and _."
\n * white space \n * brackets < > { } [ ] \n * wildcard characters
? * \n * special characters \" # % \\ ^ | ~ ` $ & , ; : / \n * control
characters (U+0000-001F, U+007F-009F) \n To enable logging with
CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and
_."
type: string
roleARN:
description: The Amazon Resource Name (ARN) of the IAM role to use
Expand Down Expand Up @@ -186,9 +185,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ .Chart.Name }} has been installed.
This chart deploys "public.ecr.aws/aws-controllers-k8s/sfn-controller:v0.1.1".
This chart deploys "public.ecr.aws/aws-controllers-k8s/sfn-controller:v0.1.2".

Check its status by running:
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
Expand Down
2 changes: 1 addition & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/sfn-controller
tag: v0.1.1
tag: v0.1.2
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down

0 comments on commit 55f67e4

Please sign in to comment.