Skip to content

Commit 102a54f

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

16 files changed

+123
-197
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-29T16:59:50Z"
3-
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
4-
go_version: go1.22.5
5-
version: v0.38.1
2+
build_date: "2024-10-10T03:56:31Z"
3+
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
4+
go_version: go1.23.2
5+
version: v0.39.1
66
api_directory_checksum: e337526dd1438ddb861e06bd92b5f640ba9ed537
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.0

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/acm-controller
9-
newTag: 0.0.19
9+
newTag: 0.0.20

config/crd/bases/acm.services.k8s.aws_certificates.yaml

Lines changed: 1 addition & 10 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: certificates.acm.services.k8s.aws
88
spec:
99
group: acm.services.k8s.aws
@@ -48,7 +48,6 @@ spec:
4848
Amazon Web Services Private Certificate Authority (https://docs.aws.amazon.com/privateca/latest/userguide/PcaWelcome.html)
4949
user guide. The ARN must have the following form:
5050
51-
5251
arn:aws:acm-pca:region:account:certificate-authority/12345678-1234-1234-1234-123456789012
5352
type: string
5453
domainName:
@@ -58,7 +57,6 @@ spec:
5857
certificate that protects several sites in the same domain. For example,
5958
*.example.com protects www.example.com, site.example.com, and images.example.com.
6059
61-
6260
In compliance with RFC 5280 (https://datatracker.ietf.org/doc/html/rfc5280),
6361
the length of the domain name (technically, the Common Name) that you provide
6462
cannot exceed 64 octets (characters), including periods. To add a longer
@@ -92,7 +90,6 @@ spec:
9290
broken. Check the requirements for the AWS service where you plan to deploy
9391
your certificate.
9492
95-
9693
Default: RSA_2048
9794
type: string
9895
options:
@@ -117,22 +114,18 @@ spec:
117114
names. If you need more than 10 names, you must request a quota increase.
118115
For more information, see Quotas (https://docs.aws.amazon.com/acm/latest/userguide/acm-limits.html).
119116
120-
121117
The maximum length of a SAN DNS name is 253 octets. The name is made up of
122118
multiple labels separated by periods. No label can be longer than 63 octets.
123119
Consider the following examples:
124120
125-
126121
* (63 octets).(63 octets).(63 octets).(61 octets) is legal because the
127122
total length is 253 octets (63+1+63+1+63+1+61) and no label exceeds 63
128123
octets.
129124
130-
131125
* (64 octets).(63 octets).(63 octets).(61 octets) is not legal because
132126
the total length exceeds 253 octets (64+1+63+1+63+1+61) and the first
133127
label exceeds 63 octets.
134128
135-
136129
* (63 octets).(63 octets).(63 octets).(62 octets) is not legal because
137130
the total length of the DNS name (63+1+63+1+63+1+62) exceeds 253 octets.
138131
items:
@@ -170,7 +163,6 @@ spec:
170163
when it has verified that an "adopted" resource (a resource where the
171164
ARN annotation was set by the Kubernetes user on the CR) exists and
172165
matches the supplied CR's Spec field values.
173-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
174166
https://github.com/aws/aws-controllers-k8s/issues/270
175167
type: string
176168
ownerAccountID:
@@ -402,7 +394,6 @@ spec:
402394
description: |-
403395
The status of the certificate.
404396
405-
406397
A certificate enters status PENDING_VALIDATION upon being requested, unless
407398
it fails for any of the reasons given in the troubleshooting topic Certificate
408399
request fails (https://docs.aws.amazon.com/acm/latest/userguide/troubleshooting-failed.html).

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 & 28 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,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
- acm.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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,36 @@ 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/spf13/pflag v1.0.5
12-
k8s.io/api v0.30.1
13-
k8s.io/apimachinery v0.30.1
14-
k8s.io/client-go v0.30.1
15-
sigs.k8s.io/controller-runtime v0.18.4
12+
k8s.io/api v0.31.0
13+
k8s.io/apimachinery v0.31.0
14+
k8s.io/client-go v0.31.0
15+
sigs.k8s.io/controller-runtime v0.19.0
1616
)
1717

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

0 commit comments

Comments
 (0)