Skip to content

Commit b1893a4

Browse files
authored
Update to ACK runtime v0.39.0, code-generator v0.39.1 (#138)
### 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.16` to `v1.0.17` Once this PR is merged, release `v1.0.17` 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.17 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.
1 parent 8f15884 commit b1893a4

16 files changed

+125
-209
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-08-29T17:04:13Z"
3-
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
4-
go_version: go1.22.5
5-
version: v0.38.1
2+
build_date: "2024-10-10T04:12:55Z"
3+
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
4+
go_version: go1.23.2
5+
version: v0.39.1
66
api_directory_checksum: 82bfc8d45e816b2a02a83a4b7cedd72056accddd
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

config/controller/kustomization.yaml

+1-1
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/s3-controller
9-
newTag: 1.0.16
9+
newTag: 1.0.17

config/crd/bases/s3.services.k8s.aws_buckets.yaml

+1-15
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: buckets.s3.services.k8s.aws
88
spec:
99
group: s3.services.k8s.aws
@@ -40,7 +40,6 @@ spec:
4040
description: |-
4141
BucketSpec defines the desired state of Bucket.
4242
43-
4443
In terms of implementation, a Bucket is a resource. An Amazon S3 bucket name
4544
is globally unique, and the namespace is shared by all Amazon Web Services
4645
accounts.
@@ -218,7 +217,6 @@ spec:
218217
description: |-
219218
Allows grantee to create new objects in the bucket.
220219
221-
222220
For the bucket and object owners of existing objects, also allows deletions
223221
and overwrites of those objects.
224222
type: string
@@ -230,7 +228,6 @@ spec:
230228
description: |-
231229
Specifies the S3 Intelligent-Tiering configuration for an Amazon S3 bucket.
232230
233-
234231
For information about the S3 Intelligent-Tiering storage class, see Storage
235232
class for automatically optimizing frequently and infrequently accessed objects
236233
(https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access).
@@ -516,7 +513,6 @@ spec:
516513
description: |-
517514
Container for granting information.
518515
519-
520516
Buckets that use the bucket owner enforced setting for Object Ownership don't
521517
support target grants. For more information, see Permissions server access
522518
log delivery (https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html#grant-log-delivery-permissions-general)
@@ -767,16 +763,13 @@ spec:
767763
description: |-
768764
The container element for object ownership for a bucket's ownership controls.
769765
770-
771766
BucketOwnerPreferred - Objects uploaded to the bucket change ownership to
772767
the bucket owner if the objects are uploaded with the bucket-owner-full-control
773768
canned ACL.
774769
775-
776770
ObjectWriter - The uploading account will own the object if the object is
777771
uploaded with the bucket-owner-full-control canned ACL.
778772
779-
780773
BucketOwnerEnforced - Access control lists (ACLs) are disabled and no longer
781774
affect permissions. The bucket owner automatically owns and has full control
782775
over every object in the bucket. The bucket only accepts PUT requests that
@@ -827,11 +820,9 @@ spec:
827820
delete markers for tag-based rules. For an example configuration, see Basic
828821
Rule Configuration (https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-add-config.html#replication-config-min-rule-config).
829822
830-
831823
For more information about delete marker replication, see Basic Rule Configuration
832824
(https://docs.aws.amazon.com/AmazonS3/latest/dev/delete-marker-replication.html).
833825
834-
835826
If you are using an earlier version of the replication configuration, Amazon
836827
S3 handles replication of delete markers differently. For more information,
837828
see Backward Compatibility (https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-add-config.html#replication-backward-compat-considerations).
@@ -922,14 +913,11 @@ spec:
922913
of objects to which the rule applies. This element is required only if you
923914
specify more than one filter.
924915
925-
926916
For example:
927917
928-
929918
* If you specify both a Prefix and a Tag filter, wrap these filters in
930919
an And tag.
931920
932-
933921
* If you specify a filter based on multiple tags, wrap the Tag elements
934922
in an And tag.
935923
properties:
@@ -981,7 +969,6 @@ spec:
981969
specify this element and set the status to Enabled to replicate modifications
982970
on replicas.
983971
984-
985972
If you don't specify the Filter element, Amazon S3 assumes that the replication
986973
configuration is the earlier version, V1. In the earlier version, this element
987974
is not allowed.
@@ -1113,7 +1100,6 @@ spec:
11131100
when it has verified that an "adopted" resource (a resource where the
11141101
ARN annotation was set by the Kubernetes user on the CR) exists and
11151102
matches the supplied CR's Spec field values.
1116-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
11171103
https://github.com/aws/aws-controllers-k8s/issues/270
11181104
type: string
11191105
ownerAccountID:

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

+1-6
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

+1-1
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

+2-28
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,15 +22,6 @@ 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
- s3.services.k8s.aws
3527
resources:
@@ -54,25 +46,6 @@ rules:
5446
- services.k8s.aws
5547
resources:
5648
- adoptedresources
57-
verbs:
58-
- create
59-
- delete
60-
- get
61-
- list
62-
- patch
63-
- update
64-
- watch
65-
- apiGroups:
66-
- services.k8s.aws
67-
resources:
68-
- adoptedresources/status
69-
verbs:
70-
- get
71-
- patch
72-
- update
73-
- apiGroups:
74-
- services.k8s.aws
75-
resources:
7649
- fieldexports
7750
verbs:
7851
- create
@@ -85,6 +58,7 @@ rules:
8558
- apiGroups:
8659
- services.k8s.aws
8760
resources:
61+
- adoptedresources/status
8862
- fieldexports/status
8963
verbs:
9064
- get

go.mod

+29-29
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,38 @@ go 1.22.0
55
toolchain go1.22.5
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.38.0
8+
github.com/aws-controllers-k8s/runtime v0.39.0
99
github.com/aws/aws-sdk-go v1.49.0
10-
github.com/go-logr/logr v1.4.1
10+
github.com/go-logr/logr v1.4.2
1111
github.com/pkg/errors v0.9.1
1212
github.com/spf13/pflag v1.0.5
13-
github.com/stretchr/testify v1.8.4
14-
k8s.io/api v0.30.1
15-
k8s.io/apimachinery v0.30.1
16-
k8s.io/client-go v0.30.1
17-
sigs.k8s.io/controller-runtime v0.18.4
13+
github.com/stretchr/testify v1.9.0
14+
k8s.io/api v0.31.0
15+
k8s.io/apimachinery v0.31.0
16+
k8s.io/client-go v0.31.0
17+
sigs.k8s.io/controller-runtime v0.19.0
1818
)
1919

2020
require (
2121
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24-
github.com/davecgh/go-spew v1.1.1 // indirect
22+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
24+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2525
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2626
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2727
github.com/fsnotify/fsnotify v1.7.0 // indirect
28+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2829
github.com/go-logr/zapr v1.3.0 // indirect
2930
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3031
github.com/go-openapi/jsonreference v0.20.2 // indirect
31-
github.com/go-openapi/swag v0.22.3 // indirect
32+
github.com/go-openapi/swag v0.22.4 // indirect
3233
github.com/gogo/protobuf v1.3.2 // indirect
3334
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3435
github.com/golang/protobuf v1.5.4 // indirect
3536
github.com/google/gnostic-models v0.6.8 // indirect
3637
github.com/google/go-cmp v0.6.0 // indirect
3738
github.com/google/gofuzz v1.2.0 // indirect
38-
github.com/google/uuid v1.3.0 // indirect
39+
github.com/google/uuid v1.6.0 // indirect
3940
github.com/imdario/mergo v0.3.12 // indirect
4041
github.com/itchyny/gojq v0.12.6 // indirect
4142
github.com/itchyny/timefmt-go v0.1.3 // indirect
@@ -44,35 +45,34 @@ require (
4445
github.com/josharian/intern v1.0.0 // indirect
4546
github.com/json-iterator/go v1.1.12 // indirect
4647
github.com/mailru/easyjson v0.7.7 // indirect
47-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4848
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4949
github.com/modern-go/reflect2 v1.0.2 // indirect
5050
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
51-
github.com/pmezard/go-difflib v1.0.0 // indirect
52-
github.com/prometheus/client_golang v1.18.0 // indirect
53-
github.com/prometheus/client_model v0.5.0 // indirect
54-
github.com/prometheus/common v0.45.0 // indirect
55-
github.com/prometheus/procfs v0.12.0 // indirect
51+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
52+
github.com/prometheus/client_golang v1.19.1 // indirect
53+
github.com/prometheus/client_model v0.6.1 // indirect
54+
github.com/prometheus/common v0.55.0 // indirect
55+
github.com/prometheus/procfs v0.15.1 // indirect
5656
github.com/samber/lo v1.37.0 // indirect
57+
github.com/x448/float16 v0.8.4 // indirect
5758
go.uber.org/multierr v1.11.0 // indirect
5859
go.uber.org/zap v1.26.0 // indirect
59-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
60-
golang.org/x/net v0.23.0 // indirect
61-
golang.org/x/oauth2 v0.12.0 // indirect
62-
golang.org/x/sys v0.18.0 // indirect
63-
golang.org/x/term v0.18.0 // indirect
64-
golang.org/x/text v0.14.0 // indirect
60+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
61+
golang.org/x/net v0.26.0 // indirect
62+
golang.org/x/oauth2 v0.21.0 // indirect
63+
golang.org/x/sys v0.21.0 // indirect
64+
golang.org/x/term v0.21.0 // indirect
65+
golang.org/x/text v0.16.0 // indirect
6566
golang.org/x/time v0.3.0 // indirect
6667
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
67-
google.golang.org/appengine v1.6.7 // indirect
68-
google.golang.org/protobuf v1.33.0 // indirect
68+
google.golang.org/protobuf v1.34.2 // indirect
6969
gopkg.in/inf.v0 v0.9.1 // indirect
7070
gopkg.in/yaml.v2 v2.4.0 // indirect
7171
gopkg.in/yaml.v3 v3.0.1 // indirect
72-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
73-
k8s.io/klog/v2 v2.120.1 // indirect
72+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
73+
k8s.io/klog/v2 v2.130.1 // indirect
7474
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
75-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
75+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
7676
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7777
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7878
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)