Skip to content

Commit 7493140

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

File tree

50 files changed

+3316
-2419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3316
-2419
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-01-29T07:11:14Z"
3-
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
4-
go_version: go1.21.5
5-
version: v0.29.2
2+
build_date: "2024-02-14T03:56:34Z"
3+
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
4+
go_version: go1.22.0
5+
version: v0.30.0
66
api_directory_checksum: 8b27f9e65dbad1f5f825c84d1dbe8fd333baf2a5
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

apis/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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/ec2-controller
9-
newTag: 1.2.2
9+
newTag: 1.2.3

config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml

Lines changed: 51 additions & 38 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: dhcpoptions.ec2.services.k8s.aws
98
spec:
109
group: ec2.services.k8s.aws
@@ -25,20 +24,28 @@ spec:
2524
description: DHCPOptions is the Schema for the DHCPOptions API
2625
properties:
2726
apiVersion:
28-
description: 'APIVersion defines the versioned schema of this representation
29-
of an object. Servers should convert recognized schemas to the latest
30-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
27+
description: |-
28+
APIVersion defines the versioned schema of this representation of an object.
29+
Servers should convert recognized schemas to the latest internal value, and
30+
may reject unrecognized values.
31+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3132
type: string
3233
kind:
33-
description: 'Kind is a string value representing the REST resource this
34-
object represents. Servers may infer this from the endpoint the client
35-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
34+
description: |-
35+
Kind is a string value representing the REST resource this object represents.
36+
Servers may infer this from the endpoint the client submits requests to.
37+
Cannot be updated.
38+
In CamelCase.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3640
type: string
3741
metadata:
3842
type: object
3943
spec:
40-
description: "DhcpOptionsSpec defines the desired state of DhcpOptions.
41-
\n Describes a set of DHCP options."
44+
description: |-
45+
DhcpOptionsSpec defines the desired state of DhcpOptions.
46+
47+
48+
Describes a set of DHCP options.
4249
properties:
4350
dhcpConfigurations:
4451
description: A DHCP configuration option.
@@ -53,9 +60,10 @@ spec:
5360
type: object
5461
type: array
5562
tags:
56-
description: The tags. The value parameter is required, but if you
57-
don't want the tag to have a value, specify the parameter with no
58-
value, and we set the value to an empty string.
63+
description: |-
64+
The tags. The value parameter is required, but if you don't want the tag
65+
to have a value, specify the parameter with no value, and we set the value
66+
to an empty string.
5967
items:
6068
description: Describes a tag.
6169
properties:
@@ -72,13 +80,14 @@ spec:
7280
vpcRefs:
7381
items:
7482
description: "AWSResourceReferenceWrapper provides a wrapper around
75-
*AWSResourceReference type to provide more user friendly syntax
76-
for references using 'from' field Ex: APIIDRef: \n from: name:
77-
my-api"
83+
*AWSResourceReference\ntype to provide more user friendly syntax
84+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
85+
\ name: my-api"
7886
properties:
7987
from:
80-
description: AWSResourceReference provides all the values necessary
81-
to reference another k8s resource for finding the identifier(Id/ARN/Name)
88+
description: |-
89+
AWSResourceReference provides all the values necessary to reference another
90+
k8s resource for finding the identifier(Id/ARN/Name)
8291
properties:
8392
name:
8493
type: string
@@ -92,24 +101,26 @@ spec:
92101
description: DHCPOptionsStatus defines the observed state of DHCPOptions
93102
properties:
94103
ackResourceMetadata:
95-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
96-
member that is used to contain resource sync state, account ownership,
104+
description: |-
105+
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
106+
that is used to contain resource sync state, account ownership,
97107
constructed ARN for the resource
98108
properties:
99109
arn:
100-
description: 'ARN is the Amazon Resource Name for the resource.
101-
This is a globally-unique identifier and is set only by the
102-
ACK service controller once the controller has orchestrated
103-
the creation of the resource OR when it has verified that an
104-
"adopted" resource (a resource where the ARN annotation was
105-
set by the Kubernetes user on the CR) exists and matches the
106-
supplied CR''s Spec field values. TODO(vijat@): Find a better
107-
strategy for resources that do not have ARN in CreateOutputResponse
108-
https://github.com/aws/aws-controllers-k8s/issues/270'
110+
description: |-
111+
ARN is the Amazon Resource Name for the resource. This is a
112+
globally-unique identifier and is set only by the ACK service controller
113+
once the controller has orchestrated the creation of the resource OR
114+
when it has verified that an "adopted" resource (a resource where the
115+
ARN annotation was set by the Kubernetes user on the CR) exists and
116+
matches the supplied CR's Spec field values.
117+
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
118+
https://github.com/aws/aws-controllers-k8s/issues/270
109119
type: string
110120
ownerAccountID:
111-
description: OwnerAccountID is the AWS Account ID of the account
112-
that owns the backend AWS service API resource.
121+
description: |-
122+
OwnerAccountID is the AWS Account ID of the account that owns the
123+
backend AWS service API resource.
113124
type: string
114125
region:
115126
description: Region is the AWS region in which the resource exists
@@ -120,14 +131,16 @@ spec:
120131
- region
121132
type: object
122133
conditions:
123-
description: All CRS managed by ACK have a common `Status.Conditions`
124-
member that contains a collection of `ackv1alpha1.Condition` objects
125-
that describe the various terminal states of the CR and its backend
126-
AWS service API resource
134+
description: |-
135+
All CRS managed by ACK have a common `Status.Conditions` member that
136+
contains a collection of `ackv1alpha1.Condition` objects that describe
137+
the various terminal states of the CR and its backend AWS service API
138+
resource
127139
items:
128-
description: Condition is the common struct used by all CRDs managed
129-
by ACK service controllers to indicate terminal states of the
130-
CR and its backend AWS service API resource
140+
description: |-
141+
Condition is the common struct used by all CRDs managed by ACK service
142+
controllers to indicate terminal states of the CR and its backend AWS
143+
service API resource
131144
properties:
132145
lastTransitionTime:
133146
description: Last time the condition transitioned from one status

config/crd/bases/ec2.services.k8s.aws_elasticipaddresses.yaml

Lines changed: 70 additions & 54 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: elasticipaddresses.ec2.services.k8s.aws
98
spec:
109
group: ec2.services.k8s.aws
@@ -28,49 +27,62 @@ spec:
2827
description: ElasticIPAddress is the Schema for the ElasticIPAddresses API
2928
properties:
3029
apiVersion:
31-
description: 'APIVersion defines the versioned schema of this representation
32-
of an object. Servers should convert recognized schemas to the latest
33-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
30+
description: |-
31+
APIVersion defines the versioned schema of this representation of an object.
32+
Servers should convert recognized schemas to the latest internal value, and
33+
may reject unrecognized values.
34+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3435
type: string
3536
kind:
36-
description: 'Kind is a string value representing the REST resource this
37-
object represents. Servers may infer this from the endpoint the client
38-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
37+
description: |-
38+
Kind is a string value representing the REST resource this object represents.
39+
Servers may infer this from the endpoint the client submits requests to.
40+
Cannot be updated.
41+
In CamelCase.
42+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3943
type: string
4044
metadata:
4145
type: object
4246
spec:
4347
description: ElasticIPAddressSpec defines the desired state of ElasticIPAddress.
4448
properties:
4549
address:
46-
description: '[EC2-VPC] The Elastic IP address to recover or an IPv4
47-
address from an address pool.'
50+
description: |-
51+
[EC2-VPC] The Elastic IP address to recover or an IPv4 address from an address
52+
pool.
4853
type: string
4954
customerOwnedIPv4Pool:
50-
description: The ID of a customer-owned address pool. Use this parameter
51-
to let Amazon EC2 select an address from the address pool. Alternatively,
52-
specify a specific address from the address pool.
55+
description: |-
56+
The ID of a customer-owned address pool. Use this parameter to let Amazon
57+
EC2 select an address from the address pool. Alternatively, specify a specific
58+
address from the address pool.
5359
type: string
5460
networkBorderGroup:
55-
description: "A unique set of Availability Zones, Local Zones, or
56-
Wavelength Zones from which Amazon Web Services advertises IP addresses.
57-
Use this parameter to limit the IP address to this location. IP
58-
addresses cannot move between network border groups. \n Use DescribeAvailabilityZones
59-
(https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html)
60-
to view the network border groups. \n You cannot use a network border
61-
group with EC2 Classic. If you attempt this operation on EC2 Classic,
62-
you receive an InvalidParameterCombination error."
61+
description: |-
62+
A unique set of Availability Zones, Local Zones, or Wavelength Zones from
63+
which Amazon Web Services advertises IP addresses. Use this parameter to
64+
limit the IP address to this location. IP addresses cannot move between network
65+
border groups.
66+
67+
68+
Use DescribeAvailabilityZones (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html)
69+
to view the network border groups.
70+
71+
72+
You cannot use a network border group with EC2 Classic. If you attempt this
73+
operation on EC2 Classic, you receive an InvalidParameterCombination error.
6374
type: string
6475
publicIPv4Pool:
65-
description: The ID of an address pool that you own. Use this parameter
66-
to let Amazon EC2 select an address from the address pool. To specify
67-
a specific address from the address pool, use the Address parameter
68-
instead.
76+
description: |-
77+
The ID of an address pool that you own. Use this parameter to let Amazon
78+
EC2 select an address from the address pool. To specify a specific address
79+
from the address pool, use the Address parameter instead.
6980
type: string
7081
tags:
71-
description: The tags. The value parameter is required, but if you
72-
don't want the tag to have a value, specify the parameter with no
73-
value, and we set the value to an empty string.
82+
description: |-
83+
The tags. The value parameter is required, but if you don't want the tag
84+
to have a value, specify the parameter with no value, and we set the value
85+
to an empty string.
7486
items:
7587
description: Describes a tag.
7688
properties:
@@ -85,24 +97,26 @@ spec:
8597
description: ElasticIPAddressStatus defines the observed state of ElasticIPAddress
8698
properties:
8799
ackResourceMetadata:
88-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
89-
member that is used to contain resource sync state, account ownership,
100+
description: |-
101+
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
102+
that is used to contain resource sync state, account ownership,
90103
constructed ARN for the resource
91104
properties:
92105
arn:
93-
description: 'ARN is the Amazon Resource Name for the resource.
94-
This is a globally-unique identifier and is set only by the
95-
ACK service controller once the controller has orchestrated
96-
the creation of the resource OR when it has verified that an
97-
"adopted" resource (a resource where the ARN annotation was
98-
set by the Kubernetes user on the CR) exists and matches the
99-
supplied CR''s Spec field values. TODO(vijat@): Find a better
100-
strategy for resources that do not have ARN in CreateOutputResponse
101-
https://github.com/aws/aws-controllers-k8s/issues/270'
106+
description: |-
107+
ARN is the Amazon Resource Name for the resource. This is a
108+
globally-unique identifier and is set only by the ACK service controller
109+
once the controller has orchestrated the creation of the resource OR
110+
when it has verified that an "adopted" resource (a resource where the
111+
ARN annotation was set by the Kubernetes user on the CR) exists and
112+
matches the supplied CR's Spec field values.
113+
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
114+
https://github.com/aws/aws-controllers-k8s/issues/270
102115
type: string
103116
ownerAccountID:
104-
description: OwnerAccountID is the AWS Account ID of the account
105-
that owns the backend AWS service API resource.
117+
description: |-
118+
OwnerAccountID is the AWS Account ID of the account that owns the
119+
backend AWS service API resource.
106120
type: string
107121
region:
108122
description: Region is the AWS region in which the resource exists
@@ -113,24 +127,26 @@ spec:
113127
- region
114128
type: object
115129
allocationID:
116-
description: '[EC2-VPC] The ID that Amazon Web Services assigns to
117-
represent the allocation of the Elastic IP address for use with
118-
instances in a VPC.'
130+
description: |-
131+
[EC2-VPC] The ID that Amazon Web Services assigns to represent the allocation
132+
of the Elastic IP address for use with instances in a VPC.
119133
type: string
120134
carrierIP:
121-
description: The carrier IP address. This option is only available
122-
for network interfaces which reside in a subnet in a Wavelength
123-
Zone (for example an EC2 instance).
135+
description: |-
136+
The carrier IP address. This option is only available for network interfaces
137+
which reside in a subnet in a Wavelength Zone (for example an EC2 instance).
124138
type: string
125139
conditions:
126-
description: All CRS managed by ACK have a common `Status.Conditions`
127-
member that contains a collection of `ackv1alpha1.Condition` objects
128-
that describe the various terminal states of the CR and its backend
129-
AWS service API resource
140+
description: |-
141+
All CRS managed by ACK have a common `Status.Conditions` member that
142+
contains a collection of `ackv1alpha1.Condition` objects that describe
143+
the various terminal states of the CR and its backend AWS service API
144+
resource
130145
items:
131-
description: Condition is the common struct used by all CRDs managed
132-
by ACK service controllers to indicate terminal states of the
133-
CR and its backend AWS service API resource
146+
description: |-
147+
Condition is the common struct used by all CRDs managed by ACK service
148+
controllers to indicate terminal states of the CR and its backend AWS
149+
service API resource
134150
properties:
135151
lastTransitionTime:
136152
description: Last time the condition transitioned from one status

0 commit comments

Comments
 (0)