Skip to content

Commit ce2bb58

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

17 files changed

+293
-279
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-02-05T22:05:18Z"
3-
build_hash: 5b4565ec2712d29988b8123aeeed6a4af57467bf
4-
go_version: go1.21.6
5-
version: v0.29.2-4-g5b4565e
2+
build_date: "2024-02-14T04:06:20Z"
3+
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
4+
go_version: go1.22.0
5+
version: v0.30.0
66
api_directory_checksum: c67645b15db39980ba51ff6303c34c5aafc55a9e
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.181

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/lambda-controller
9-
newTag: 1.4.0
9+
newTag: 1.4.1

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

Lines changed: 117 additions & 89 deletions
Large diffs are not rendered by default.

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

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: fieldexports.services.k8s.aws
98
spec:
109
group: services.k8s.aws
@@ -21,30 +20,37 @@ spec:
2120
description: FieldExport is the schema for the FieldExport API.
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
3539
spec:
3640
description: FieldExportSpec defines the desired state of the FieldExport.
3741
properties:
3842
from:
39-
description: ResourceFieldSelector provides the values necessary to
40-
identify an individual field on an individual K8s resource.
43+
description: |-
44+
ResourceFieldSelector provides the values necessary to identify an individual
45+
field on an individual K8s resource.
4146
properties:
4247
path:
4348
type: string
4449
resource:
45-
description: NamespacedResource provides all the values necessary
46-
to identify an ACK resource of a given type (within the same
47-
namespace as the custom resource containing this type).
50+
description: |-
51+
NamespacedResource provides all the values necessary to identify an ACK
52+
resource of a given type (within the same namespace as the custom resource
53+
containing this type).
4854
properties:
4955
group:
5056
type: string
@@ -62,16 +68,18 @@ spec:
6268
- resource
6369
type: object
6470
to:
65-
description: FieldExportTarget provides the values necessary to identify
66-
the output path for a field export.
71+
description: |-
72+
FieldExportTarget provides the values necessary to identify the
73+
output path for a field export.
6774
properties:
6875
key:
6976
description: Key overrides the default value (`<namespace>.<FieldExport-resource-name>`)
7077
for the FieldExport target
7178
type: string
7279
kind:
73-
description: FieldExportOutputType represents all types that can
74-
be produced by a field export operation
80+
description: |-
81+
FieldExportOutputType represents all types that can be produced by a field
82+
export operation
7583
enum:
7684
- configmap
7785
- secret
@@ -94,12 +102,14 @@ spec:
94102
description: FieldExportStatus defines the observed status of the FieldExport.
95103
properties:
96104
conditions:
97-
description: A collection of `ackv1alpha1.Condition` objects that
98-
describe the various recoverable states of the field CR
105+
description: |-
106+
A collection of `ackv1alpha1.Condition` objects that describe the various
107+
recoverable states of the field CR
99108
items:
100-
description: Condition is the common struct used by all CRDs managed
101-
by ACK service controllers to indicate terminal states of the
102-
CR and its backend AWS service API resource
109+
description: |-
110+
Condition is the common struct used by all CRDs managed by ACK service
111+
controllers to indicate terminal states of the CR and its backend AWS
112+
service API resource
103113
properties:
104114
lastTransitionTime:
105115
description: Last time the condition transitioned from one status

go.mod

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ require (
1010
github.com/aws-controllers-k8s/kafka-controller v0.0.0-20230615185632-102279061de1
1111
github.com/aws-controllers-k8s/kms-controller v0.1.2
1212
github.com/aws-controllers-k8s/mq-controller v0.0.22
13-
github.com/aws-controllers-k8s/runtime v0.29.2
13+
github.com/aws-controllers-k8s/runtime v0.30.0
1414
github.com/aws-controllers-k8s/s3-controller v0.1.5
1515
github.com/aws/aws-sdk-go v1.49.0
16-
github.com/go-logr/logr v1.2.4
16+
github.com/go-logr/logr v1.4.1
1717
github.com/spf13/pflag v1.0.5
18-
k8s.io/api v0.28.3
19-
k8s.io/apimachinery v0.28.3
20-
k8s.io/client-go v0.28.3
21-
sigs.k8s.io/controller-runtime v0.16.3
18+
k8s.io/api v0.29.0
19+
k8s.io/apimachinery v0.29.0
20+
k8s.io/client-go v0.29.0
21+
sigs.k8s.io/controller-runtime v0.17.0
2222
)
2323

2424
require (
@@ -27,17 +27,17 @@ require (
2727
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2828
github.com/davecgh/go-spew v1.1.1 // indirect
2929
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
30-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
31-
github.com/fsnotify/fsnotify v1.6.0 // indirect
32-
github.com/go-logr/zapr v1.2.4 // indirect
30+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
31+
github.com/fsnotify/fsnotify v1.7.0 // indirect
32+
github.com/go-logr/zapr v1.3.0 // indirect
3333
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3434
github.com/go-openapi/jsonreference v0.20.2 // indirect
3535
github.com/go-openapi/swag v0.22.3 // indirect
3636
github.com/gogo/protobuf v1.3.2 // indirect
3737
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3838
github.com/golang/protobuf v1.5.3 // indirect
3939
github.com/google/gnostic-models v0.6.8 // indirect
40-
github.com/google/go-cmp v0.5.9 // indirect
40+
github.com/google/go-cmp v0.6.0 // indirect
4141
github.com/google/gofuzz v1.2.0 // indirect
4242
github.com/google/uuid v1.3.0 // indirect
4343
github.com/imdario/mergo v0.3.12 // indirect
@@ -48,37 +48,37 @@ require (
4848
github.com/josharian/intern v1.0.0 // indirect
4949
github.com/json-iterator/go v1.1.12 // indirect
5050
github.com/mailru/easyjson v0.7.7 // indirect
51-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
51+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
5252
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5353
github.com/modern-go/reflect2 v1.0.2 // indirect
5454
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5555
github.com/pkg/errors v0.9.1 // indirect
56-
github.com/prometheus/client_golang v1.16.0 // indirect
57-
github.com/prometheus/client_model v0.4.0 // indirect
58-
github.com/prometheus/common v0.44.0 // indirect
59-
github.com/prometheus/procfs v0.10.1 // indirect
56+
github.com/prometheus/client_golang v1.18.0 // indirect
57+
github.com/prometheus/client_model v0.5.0 // indirect
58+
github.com/prometheus/common v0.45.0 // indirect
59+
github.com/prometheus/procfs v0.12.0 // indirect
6060
github.com/samber/lo v1.37.0 // indirect
6161
go.uber.org/multierr v1.11.0 // indirect
6262
go.uber.org/zap v1.26.0 // indirect
6363
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
64-
golang.org/x/net v0.17.0 // indirect
65-
golang.org/x/oauth2 v0.8.0 // indirect
66-
golang.org/x/sys v0.13.0 // indirect
67-
golang.org/x/term v0.13.0 // indirect
68-
golang.org/x/text v0.13.0 // indirect
64+
golang.org/x/net v0.19.0 // indirect
65+
golang.org/x/oauth2 v0.12.0 // indirect
66+
golang.org/x/sys v0.16.0 // indirect
67+
golang.org/x/term v0.15.0 // indirect
68+
golang.org/x/text v0.14.0 // indirect
6969
golang.org/x/time v0.3.0 // indirect
7070
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7171
google.golang.org/appengine v1.6.7 // indirect
72-
google.golang.org/protobuf v1.30.0 // indirect
72+
google.golang.org/protobuf v1.31.0 // indirect
7373
gopkg.in/inf.v0 v0.9.1 // indirect
7474
gopkg.in/yaml.v2 v2.4.0 // indirect
7575
gopkg.in/yaml.v3 v3.0.1 // indirect
76-
k8s.io/apiextensions-apiserver v0.28.3 // indirect
77-
k8s.io/component-base v0.28.3 // indirect
78-
k8s.io/klog/v2 v2.100.1 // indirect
79-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
80-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
76+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
77+
k8s.io/component-base v0.29.0 // indirect
78+
k8s.io/klog/v2 v2.110.1 // indirect
79+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
80+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
8181
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
82-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
83-
sigs.k8s.io/yaml v1.3.0 // indirect
82+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
83+
sigs.k8s.io/yaml v1.4.0 // indirect
8484
)

0 commit comments

Comments
 (0)