Skip to content

Commit

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

----------

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

----------

NOTE:
This PR increments the release version of service controller from `v1.0.8` to `v1.0.9`

Once this PR is merged, release `v1.0.9` will be automatically created for `s3-controller`

**Please close this PR, if you do not want the new patch release for `s3-controller`**

----------

#### stdout for `make build-controller`:

```
building ack-generate ... ok.
==== building s3-controller ====
Copying common custom resource definitions into s3
Building Kubernetes API objects for s3
Generating deepcopy code for s3
Generating custom resource definitions for s3
Building service controller for s3
Generating RBAC manifests for s3
Running gofmt against generated code for s3
Updating additional GitHub repository maintenance files
==== building s3-controller release artifacts ====
Building release artifacts for s3-v1.0.9
Generating common custom resource definitions
Generating custom resource definitions for s3
Generating RBAC manifests for s3
```

----------

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 committed Feb 14, 2024
1 parent bc67beb commit 6aa3f7f
Show file tree
Hide file tree
Showing 22 changed files with 1,117 additions and 978 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-01-29T07:04:57Z"
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
go_version: go1.21.5
version: v0.29.2
build_date: "2024-02-14T04:03:57Z"
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
go_version: go1.22.0
version: v0.30.0
api_directory_checksum: f50cdf03c85532166479736d285eaf6330f91d2b
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
Expand Down
1 change: 0 additions & 1 deletion apis/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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/s3-controller
newTag: 1.0.8
newTag: 1.0.9
627 changes: 336 additions & 291 deletions config/crd/bases/s3.services.k8s.aws_buckets.yaml

Large diffs are not rendered by default.

206 changes: 117 additions & 89 deletions config/crd/common/bases/services.k8s.aws_adoptedresources.yaml

Large diffs are not rendered by default.

54 changes: 32 additions & 22 deletions config/crd/common/bases/services.k8s.aws_fieldexports.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: fieldexports.services.k8s.aws
spec:
group: services.k8s.aws
Expand All @@ -21,30 +20,37 @@ spec:
description: FieldExport is the schema for the FieldExport API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: FieldExportSpec defines the desired state of the FieldExport.
properties:
from:
description: ResourceFieldSelector provides the values necessary to
identify an individual field on an individual K8s resource.
description: |-
ResourceFieldSelector provides the values necessary to identify an individual
field on an individual K8s resource.
properties:
path:
type: string
resource:
description: NamespacedResource provides all the values necessary
to identify an ACK resource of a given type (within the same
namespace as the custom resource containing this type).
description: |-
NamespacedResource provides all the values necessary to identify an ACK
resource of a given type (within the same namespace as the custom resource
containing this type).
properties:
group:
type: string
Expand All @@ -62,16 +68,18 @@ spec:
- resource
type: object
to:
description: FieldExportTarget provides the values necessary to identify
the output path for a field export.
description: |-
FieldExportTarget provides the values necessary to identify the
output path for a field export.
properties:
key:
description: Key overrides the default value (`<namespace>.<FieldExport-resource-name>`)
for the FieldExport target
type: string
kind:
description: FieldExportOutputType represents all types that can
be produced by a field export operation
description: |-
FieldExportOutputType represents all types that can be produced by a field
export operation
enum:
- configmap
- secret
Expand All @@ -94,12 +102,14 @@ spec:
description: FieldExportStatus defines the observed status of the FieldExport.
properties:
conditions:
description: A collection of `ackv1alpha1.Condition` objects that
describe the various recoverable states of the field CR
description: |-
A collection of `ackv1alpha1.Condition` objects that describe the various
recoverable states of the field CR
items:
description: Condition is the common struct used by all CRDs managed
by ACK service controllers to indicate terminal states of the
CR and its backend AWS service API resource
description: |-
Condition is the common struct used by all CRDs managed by ACK service
controllers to indicate terminal states of the CR and its backend AWS
service API resource
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
Expand Down
1 change: 0 additions & 1 deletion config/rbac/cluster-role-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: ack-s3-controller
rules:
- apiGroups:
Expand Down
58 changes: 29 additions & 29 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ go 1.21
toolchain go1.21.5

require (
github.com/aws-controllers-k8s/runtime v0.29.2
github.com/aws-controllers-k8s/runtime v0.30.0
github.com/aws/aws-sdk-go v1.49.0
github.com/go-logr/logr v1.2.4
github.com/go-logr/logr v1.4.1
github.com/pkg/errors v0.9.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.2
k8s.io/api v0.28.3
k8s.io/apimachinery v0.28.3
k8s.io/client-go v0.28.3
sigs.k8s.io/controller-runtime v0.16.3
github.com/stretchr/testify v1.8.4
k8s.io/api v0.29.0
k8s.io/apimachinery v0.29.0
k8s.io/client-go v0.29.0
sigs.k8s.io/controller-runtime v0.17.0
)

require (
Expand All @@ -23,17 +23,17 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
Expand All @@ -44,37 +44,37 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/samber/lo v1.37.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.28.3 // indirect
k8s.io/component-base v0.28.3 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
k8s.io/apiextensions-apiserver v0.29.0 // indirect
k8s.io/component-base v0.29.0 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 6aa3f7f

Please sign in to comment.