Skip to content

Commit 9666086

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

24 files changed

+157
-387
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-10-01T23:40:20Z"
3-
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
4-
go_version: go1.22.5
5-
version: v0.38.1
2+
build_date: "2024-10-10T03:59:03Z"
3+
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
4+
go_version: go1.23.2
5+
version: v0.39.1
66
api_directory_checksum: 384f1a5b6a0daffcccbca3122cb095b288963990
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.55.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/apigateway-controller
9-
newTag: 0.0.2
9+
newTag: 0.0.3

config/crd/bases/apigateway.services.k8s.aws_integrations.yaml

Lines changed: 5 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: integrations.apigateway.services.k8s.aws
88
spec:
99
group: apigateway.services.k8s.aws
@@ -40,7 +40,6 @@ spec:
4040
description: |-
4141
IntegrationSpec defines the desired state of Integration.
4242
43-
4443
Represents an HTTP, HTTP_PROXY, AWS, AWS_PROXY, or Mock integration.
4544
properties:
4645
cacheKeyParameters:
@@ -66,7 +65,7 @@ spec:
6665
connectionRef:
6766
description: "AWSResourceReferenceWrapper provides a wrapper around
6867
*AWSResourceReference\ntype to provide more user friendly syntax
69-
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
68+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
7069
\ name: my-api"
7170
properties:
7271
from:
@@ -92,7 +91,6 @@ spec:
9291
Specifies how to handle request payload content type conversions. Supported
9392
values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:
9493
95-
9694
If this property is not defined, the request payload will be passed through
9795
from the method request to integration request without modification, provided
9896
that the passthroughBehavior is configured to support payload pass-through.
@@ -141,7 +139,7 @@ spec:
141139
resourceRef:
142140
description: "AWSResourceReferenceWrapper provides a wrapper around
143141
*AWSResourceReference\ntype to provide more user friendly syntax
144-
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
142+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
145143
\ name: my-api"
146144
properties:
147145
from:
@@ -161,7 +159,7 @@ spec:
161159
restAPIRef:
162160
description: "AWSResourceReferenceWrapper provides a wrapper around
163161
*AWSResourceReference\ntype to provide more user friendly syntax
164-
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
162+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
165163
\ name: my-api"
166164
properties:
167165
from:
@@ -214,6 +212,7 @@ spec:
214212
type: string
215213
required:
216214
- httpMethod
215+
- type
217216
type: object
218217
status:
219218
description: IntegrationStatus defines the observed state of Integration
@@ -232,7 +231,6 @@ spec:
232231
when it has verified that an "adopted" resource (a resource where the
233232
ARN annotation was set by the Kubernetes user on the CR) exists and
234233
matches the supplied CR's Spec field values.
235-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
236234
https://github.com/aws/aws-controllers-k8s/issues/270
237235
type: string
238236
ownerAccountID:

config/crd/bases/apigateway.services.k8s.aws_resources.yaml

Lines changed: 3 additions & 5 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: resources.apigateway.services.k8s.aws
88
spec:
99
group: apigateway.services.k8s.aws
@@ -40,7 +40,6 @@ spec:
4040
description: |-
4141
ResourceSpec defines the desired state of Resource.
4242
43-
4443
Represents an API resource.
4544
properties:
4645
parentID:
@@ -49,7 +48,7 @@ spec:
4948
parentRef:
5049
description: "AWSResourceReferenceWrapper provides a wrapper around
5150
*AWSResourceReference\ntype to provide more user friendly syntax
52-
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
51+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
5352
\ name: my-api"
5453
properties:
5554
from:
@@ -72,7 +71,7 @@ spec:
7271
restAPIRef:
7372
description: "AWSResourceReferenceWrapper provides a wrapper around
7473
*AWSResourceReference\ntype to provide more user friendly syntax
75-
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
74+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
7675
\ name: my-api"
7776
properties:
7877
from:
@@ -106,7 +105,6 @@ spec:
106105
when it has verified that an "adopted" resource (a resource where the
107106
ARN annotation was set by the Kubernetes user on the CR) exists and
108107
matches the supplied CR's Spec field values.
109-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
110108
https://github.com/aws/aws-controllers-k8s/issues/270
111109
type: string
112110
ownerAccountID:

config/crd/bases/apigateway.services.k8s.aws_restapis.yaml

Lines changed: 2 additions & 4 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: restapis.apigateway.services.k8s.aws
88
spec:
99
group: apigateway.services.k8s.aws
@@ -40,7 +40,6 @@ spec:
4040
description: |-
4141
RestApiSpec defines the desired state of RestApi.
4242
43-
4443
Represents a REST API.
4544
properties:
4645
apiKeySource:
@@ -88,7 +87,7 @@ spec:
8887
items:
8988
description: "AWSResourceReferenceWrapper provides a wrapper
9089
around *AWSResourceReference\ntype to provide more user friendly
91-
syntax for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
90+
syntax for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
9291
\ name: my-api"
9392
properties:
9493
from:
@@ -152,7 +151,6 @@ spec:
152151
when it has verified that an "adopted" resource (a resource where the
153152
ARN annotation was set by the Kubernetes user on the CR) exists and
154153
matches the supplied CR's Spec field values.
155-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
156154
https://github.com/aws/aws-controllers-k8s/issues/270
157155
type: string
158156
ownerAccountID:

config/crd/bases/apigateway.services.k8s.aws_stages.yaml

Lines changed: 2 additions & 4 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: stages.apigateway.services.k8s.aws
88
spec:
99
group: apigateway.services.k8s.aws
@@ -40,7 +40,6 @@ spec:
4040
description: |-
4141
StageSpec defines the desired state of Stage.
4242
43-
4443
Represents a unique identifier for a version of a deployed RestApi that is
4544
callable by users.
4645
properties:
@@ -82,7 +81,7 @@ spec:
8281
restAPIRef:
8382
description: "AWSResourceReferenceWrapper provides a wrapper around
8483
*AWSResourceReference\ntype to provide more user friendly syntax
85-
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
84+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
8685
\ name: my-api"
8786
properties:
8887
from:
@@ -150,7 +149,6 @@ spec:
150149
when it has verified that an "adopted" resource (a resource where the
151150
ARN annotation was set by the Kubernetes user on the CR) exists and
152151
matches the supplied CR's Spec field values.
153-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
154152
https://github.com/aws/aws-controllers-k8s/issues/270
155153
type: string
156154
ownerAccountID:

config/crd/bases/apigateway.services.k8s.aws_vpclinks.yaml

Lines changed: 1 addition & 2 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: vpclinks.apigateway.services.k8s.aws
88
spec:
99
group: apigateway.services.k8s.aws
@@ -82,7 +82,6 @@ spec:
8282
when it has verified that an "adopted" resource (a resource where the
8383
ARN annotation was set by the Kubernetes user on the CR) exists and
8484
matches the supplied CR's Spec field values.
85-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
8685
https://github.com/aws/aws-controllers-k8s/issues/270
8786
type: string
8887
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

0 commit comments

Comments
 (0)