Skip to content

Commit 6349749

Browse files
authoredOct 12, 2024··
Merge pull request #6 from aws-controllers-k8s/ack-bot/rt-v0.39.0-codegen-v0.39.1
Update to ACK runtime `v0.39.0`, code-generator `v0.39.1`
2 parents 0b86f5f + 14d906c commit 6349749

11 files changed

+116
-172
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-29T16:59:24Z"
3-
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
4-
go_version: go1.22.5
5-
version: v0.38.1
2+
build_date: "2024-10-10T04:11:56Z"
3+
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
4+
go_version: go1.23.2
5+
version: v0.39.1
66
api_directory_checksum: e6e32cdfd8eea9dc8ced5c64c857335c872e49e2
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.55.5

‎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,38 +22,10 @@ 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
- services.k8s.aws
3527
resources:
3628
- adoptedresources
37-
verbs:
38-
- create
39-
- delete
40-
- get
41-
- list
42-
- patch
43-
- update
44-
- watch
45-
- apiGroups:
46-
- services.k8s.aws
47-
resources:
48-
- adoptedresources/status
49-
verbs:
50-
- get
51-
- patch
52-
- update
53-
- apiGroups:
54-
- services.k8s.aws
55-
resources:
5629
- fieldexports
5730
verbs:
5831
- create
@@ -65,6 +38,7 @@ rules:
6538
- apiGroups:
6639
- services.k8s.aws
6740
resources:
41+
- adoptedresources/status
6842
- fieldexports/status
6943
verbs:
7044
- get

‎go.mod

+27-27
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,35 @@ go 1.22.0
55
toolchain go1.22.3
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.55.5
1010
github.com/spf13/pflag v1.0.5
11-
k8s.io/apimachinery v0.30.1
12-
k8s.io/client-go v0.30.1
13-
sigs.k8s.io/controller-runtime v0.18.4
11+
k8s.io/apimachinery v0.31.0
12+
k8s.io/client-go v0.31.0
13+
sigs.k8s.io/controller-runtime v0.19.0
1414
)
1515

1616
require (
1717
github.com/beorn7/perks v1.0.1 // indirect
18-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
19-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
20-
github.com/davecgh/go-spew v1.1.1 // indirect
18+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
19+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
20+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2121
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2222
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2323
github.com/fsnotify/fsnotify v1.7.0 // indirect
24-
github.com/go-logr/logr v1.4.1 // indirect
24+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
25+
github.com/go-logr/logr v1.4.2 // indirect
2526
github.com/go-logr/zapr v1.3.0 // indirect
2627
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2728
github.com/go-openapi/jsonreference v0.20.2 // indirect
28-
github.com/go-openapi/swag v0.22.3 // indirect
29+
github.com/go-openapi/swag v0.22.4 // indirect
2930
github.com/gogo/protobuf v1.3.2 // indirect
3031
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3132
github.com/golang/protobuf v1.5.4 // indirect
3233
github.com/google/gnostic-models v0.6.8 // indirect
3334
github.com/google/go-cmp v0.6.0 // indirect
3435
github.com/google/gofuzz v1.2.0 // indirect
35-
github.com/google/uuid v1.3.0 // indirect
36+
github.com/google/uuid v1.6.0 // indirect
3637
github.com/imdario/mergo v0.3.12 // indirect
3738
github.com/itchyny/gojq v0.12.6 // indirect
3839
github.com/itchyny/timefmt-go v0.1.3 // indirect
@@ -41,36 +42,35 @@ require (
4142
github.com/josharian/intern v1.0.0 // indirect
4243
github.com/json-iterator/go v1.1.12 // indirect
4344
github.com/mailru/easyjson v0.7.7 // indirect
44-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4545
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4646
github.com/modern-go/reflect2 v1.0.2 // indirect
4747
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4848
github.com/pkg/errors v0.9.1 // indirect
49-
github.com/prometheus/client_golang v1.18.0 // indirect
50-
github.com/prometheus/client_model v0.5.0 // indirect
51-
github.com/prometheus/common v0.45.0 // indirect
52-
github.com/prometheus/procfs v0.12.0 // indirect
49+
github.com/prometheus/client_golang v1.19.1 // indirect
50+
github.com/prometheus/client_model v0.6.1 // indirect
51+
github.com/prometheus/common v0.55.0 // indirect
52+
github.com/prometheus/procfs v0.15.1 // indirect
5353
github.com/samber/lo v1.37.0 // indirect
54+
github.com/x448/float16 v0.8.4 // indirect
5455
go.uber.org/multierr v1.11.0 // indirect
5556
go.uber.org/zap v1.26.0 // indirect
56-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
57-
golang.org/x/net v0.23.0 // indirect
58-
golang.org/x/oauth2 v0.12.0 // indirect
59-
golang.org/x/sys v0.18.0 // indirect
60-
golang.org/x/term v0.18.0 // indirect
61-
golang.org/x/text v0.14.0 // indirect
57+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
58+
golang.org/x/net v0.26.0 // indirect
59+
golang.org/x/oauth2 v0.21.0 // indirect
60+
golang.org/x/sys v0.21.0 // indirect
61+
golang.org/x/term v0.21.0 // indirect
62+
golang.org/x/text v0.16.0 // indirect
6263
golang.org/x/time v0.3.0 // indirect
6364
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
64-
google.golang.org/appengine v1.6.7 // indirect
65-
google.golang.org/protobuf v1.33.0 // indirect
65+
google.golang.org/protobuf v1.34.2 // indirect
6666
gopkg.in/inf.v0 v0.9.1 // indirect
6767
gopkg.in/yaml.v2 v2.4.0 // indirect
6868
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/api v0.30.1 // indirect
70-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
71-
k8s.io/klog/v2 v2.120.1 // indirect
69+
k8s.io/api v0.31.0 // 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)
Please sign in to comment.