Skip to content

Commit 360eb53

Browse files
authored
Update to ACK runtime v0.39.0, code-generator v0.39.1 (#85)
### 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 `v0.0.36` to `v0.0.37` Once this PR is merged, release `v0.0.37` will be automatically created for `mq-controller` **Please close this PR, if you do not want the new patch release for `mq-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building mq-controller ==== Copying common custom resource definitions into mq Building Kubernetes API objects for mq Generating deepcopy code for mq Generating custom resource definitions for mq Building service controller for mq Generating RBAC manifests for mq Running gofmt against generated code for mq Updating additional GitHub repository maintenance files ==== building mq-controller release artifacts ==== Building release artifacts for mq-v0.0.37 Generating common custom resource definitions Generating custom resource definitions for mq Generating RBAC manifests for mq ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 50521c1 commit 360eb53

16 files changed

+127
-227
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:10:15Z"
3-
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
4-
go_version: go1.22.5
5-
version: v0.38.1
2+
build_date: "2024-10-10T04:10:49Z"
3+
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
4+
go_version: go1.23.2
5+
version: v0.39.1
66
api_directory_checksum: 2be594918c4fa03c742bb5d656f8b097cbc7f4c5
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/mq-controller
9-
newTag: 0.0.36
9+
newTag: 0.0.37

config/crd/bases/mq.services.k8s.aws_brokers.yaml

Lines changed: 3 additions & 7 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: brokers.mq.services.k8s.aws
88
spec:
99
group: mq.services.k8s.aws
@@ -47,7 +47,6 @@ spec:
4747
description: |-
4848
A list of information about the configuration.
4949
50-
5150
Does not apply to RabbitMQ brokers.
5251
properties:
5352
id:
@@ -64,7 +63,6 @@ spec:
6463
description: |-
6564
Does not apply to RabbitMQ brokers.
6665
67-
6866
Encryption options for the broker.
6967
properties:
7068
kmsKeyID:
@@ -83,7 +81,6 @@ spec:
8381
Optional. The metadata of the LDAP server used to authenticate and authorize
8482
connections to the broker.
8583
86-
8784
Does not apply to RabbitMQ brokers.
8885
properties:
8986
hosts:
@@ -140,7 +137,7 @@ spec:
140137
items:
141138
description: "AWSResourceReferenceWrapper provides a wrapper around
142139
*AWSResourceReference\ntype to provide more user friendly syntax
143-
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
140+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
144141
\ name: my-api"
145142
properties:
146143
from:
@@ -169,7 +166,7 @@ spec:
169166
items:
170167
description: "AWSResourceReferenceWrapper provides a wrapper around
171168
*AWSResourceReference\ntype to provide more user friendly syntax
172-
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
169+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
173170
\ name: my-api"
174171
properties:
175172
from:
@@ -253,7 +250,6 @@ spec:
253250
when it has verified that an "adopted" resource (a resource where the
254251
ARN annotation was set by the Kubernetes user on the CR) exists and
255252
matches the supplied CR's Spec field values.
256-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
257253
https://github.com/aws/aws-controllers-k8s/issues/270
258254
type: string
259255
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: 2 additions & 46 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,39 +22,12 @@ 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
- ec2.services.k8s.aws
3527
resources:
3628
- securitygroups
37-
verbs:
38-
- get
39-
- list
40-
- apiGroups:
41-
- ec2.services.k8s.aws
42-
resources:
4329
- securitygroups/status
44-
verbs:
45-
- get
46-
- list
47-
- apiGroups:
48-
- ec2.services.k8s.aws
49-
resources:
5030
- subnets
51-
verbs:
52-
- get
53-
- list
54-
- apiGroups:
55-
- ec2.services.k8s.aws
56-
resources:
5731
- subnets/status
5832
verbs:
5933
- get
@@ -82,25 +56,6 @@ rules:
8256
- services.k8s.aws
8357
resources:
8458
- adoptedresources
85-
verbs:
86-
- create
87-
- delete
88-
- get
89-
- list
90-
- patch
91-
- update
92-
- watch
93-
- apiGroups:
94-
- services.k8s.aws
95-
resources:
96-
- adoptedresources/status
97-
verbs:
98-
- get
99-
- patch
100-
- update
101-
- apiGroups:
102-
- services.k8s.aws
103-
resources:
10459
- fieldexports
10560
verbs:
10661
- create
@@ -113,6 +68,7 @@ rules:
11368
- apiGroups:
11469
- services.k8s.aws
11570
resources:
71+
- adoptedresources/status
11672
- fieldexports/status
11773
verbs:
11874
- get

go.mod

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,36 @@ toolchain go1.22.5
66

77
require (
88
github.com/aws-controllers-k8s/ec2-controller v0.0.21
9-
github.com/aws-controllers-k8s/runtime v0.38.0
9+
github.com/aws-controllers-k8s/runtime v0.39.0
1010
github.com/aws/aws-sdk-go v1.49.0
11-
github.com/go-logr/logr v1.4.1
11+
github.com/go-logr/logr v1.4.2
1212
github.com/spf13/pflag v1.0.5
13-
k8s.io/api v0.30.1
14-
k8s.io/apimachinery v0.30.1
15-
k8s.io/client-go v0.30.1
16-
sigs.k8s.io/controller-runtime v0.18.4
13+
k8s.io/api v0.31.0
14+
k8s.io/apimachinery v0.31.0
15+
k8s.io/client-go v0.31.0
16+
sigs.k8s.io/controller-runtime v0.19.0
1717
)
1818

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

0 commit comments

Comments
 (0)