Skip to content

Commit

Permalink
Update to ACK runtime v0.30.0, code-generator v0.30.0 (#179)
Browse files Browse the repository at this point in the history 
### 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.
  • Loading branch information
@ack-bot
ack-bot authored Feb 14, 2024
1 parent b6c12f9 commit 7493140
Show file tree
Hide file tree
Showing 50 changed files with 3,316 additions and 2,419 deletions.
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2024-01-29T07:11:14Z"
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
go_version: go1.21.5
version: v0.29.2
build_date: "2024-02-14T03:56:34Z"
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
go_version: go1.22.0
version: v0.30.0
api_directory_checksum: 8b27f9e65dbad1f5f825c84d1dbe8fd333baf2a5
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
Expand Down
1 change: 0 additions & 1 deletion apis/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/ec2-controller
newTag: 1.2.2
newTag: 1.2.3
89 changes: 51 additions & 38 deletions config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: dhcpoptions.ec2.services.k8s.aws
spec:
group: ec2.services.k8s.aws
Expand All @@ -25,20 +24,28 @@ spec:
description: DHCPOptions is the Schema for the DHCPOptions API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: "DhcpOptionsSpec defines the desired state of DhcpOptions.
\n Describes a set of DHCP options."
description: |-
DhcpOptionsSpec defines the desired state of DhcpOptions.
Describes a set of DHCP options.
properties:
dhcpConfigurations:
description: A DHCP configuration option.
Expand All @@ -53,9 +60,10 @@ spec:
type: object
type: array
tags:
description: The tags. The value parameter is required, but if you
don't want the tag to have a value, specify the parameter with no
value, and we set the value to an empty string.
description: |-
The tags. The value parameter is required, but if you don't want the tag
to have a value, specify the parameter with no value, and we set the value
to an empty string.
items:
description: Describes a tag.
properties:
Expand All @@ -72,13 +80,14 @@ spec:
vpcRefs:
items:
description: "AWSResourceReferenceWrapper provides a wrapper around
*AWSResourceReference type to provide more user friendly syntax
for references using 'from' field Ex: APIIDRef: \n from: name:
my-api"
*AWSResourceReference\ntype to provide more user friendly syntax
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
\ name: my-api"
properties:
from:
description: AWSResourceReference provides all the values necessary
to reference another k8s resource for finding the identifier(Id/ARN/Name)
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
Expand All @@ -92,24 +101,26 @@ spec:
description: DHCPOptionsStatus defines the observed state of DHCPOptions
properties:
ackResourceMetadata:
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
member that is used to contain resource sync state, account ownership,
description: |-
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
that is used to contain resource sync state, account ownership,
constructed ARN for the resource
properties:
arn:
description: 'ARN is the Amazon Resource Name for the resource.
This is a globally-unique identifier and is set only by the
ACK service controller once the controller has orchestrated
the creation of the resource OR when it has verified that an
"adopted" resource (a resource where the ARN annotation was
set by the Kubernetes user on the CR) exists and matches the
supplied CR''s Spec field values. TODO(vijat@): Find a better
strategy for resources that do not have ARN in CreateOutputResponse
https://github.com/aws/aws-controllers-k8s/issues/270'
description: |-
ARN is the Amazon Resource Name for the resource. This is a
globally-unique identifier and is set only by the ACK service controller
once the controller has orchestrated the creation of the resource OR
when it has verified that an "adopted" resource (a resource where the
ARN annotation was set by the Kubernetes user on the CR) exists and
matches the supplied CR's Spec field values.
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
https://github.com/aws/aws-controllers-k8s/issues/270
type: string
ownerAccountID:
description: OwnerAccountID is the AWS Account ID of the account
that owns the backend AWS service API resource.
description: |-
OwnerAccountID is the AWS Account ID of the account that owns the
backend AWS service API resource.
type: string
region:
description: Region is the AWS region in which the resource exists
Expand All @@ -120,14 +131,16 @@ spec:
- region
type: object
conditions:
description: All CRS managed by ACK have a common `Status.Conditions`
member that contains a collection of `ackv1alpha1.Condition` objects
that describe the various terminal states of the CR and its backend
AWS service API resource
description: |-
All CRS managed by ACK have a common `Status.Conditions` member that
contains a collection of `ackv1alpha1.Condition` objects that describe
the various terminal states of the CR and its backend AWS service API
resource
items:
description: Condition is the common struct used by all CRDs managed
by ACK service controllers to indicate terminal states of the
CR and its backend AWS service API resource
description: |-
Condition is the common struct used by all CRDs managed by ACK service
controllers to indicate terminal states of the CR and its backend AWS
service API resource
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
Expand Down
124 changes: 70 additions & 54 deletions config/crd/bases/ec2.services.k8s.aws_elasticipaddresses.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: elasticipaddresses.ec2.services.k8s.aws
spec:
group: ec2.services.k8s.aws
Expand All @@ -28,49 +27,62 @@ spec:
description: ElasticIPAddress is the Schema for the ElasticIPAddresses API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: ElasticIPAddressSpec defines the desired state of ElasticIPAddress.
properties:
address:
description: '[EC2-VPC] The Elastic IP address to recover or an IPv4
address from an address pool.'
description: |-
[EC2-VPC] The Elastic IP address to recover or an IPv4 address from an address
pool.
type: string
customerOwnedIPv4Pool:
description: The ID of a customer-owned address pool. Use this parameter
to let Amazon EC2 select an address from the address pool. Alternatively,
specify a specific address from the address pool.
description: |-
The ID of a customer-owned address pool. Use this parameter to let Amazon
EC2 select an address from the address pool. Alternatively, specify a specific
address from the address pool.
type: string
networkBorderGroup:
description: "A unique set of Availability Zones, Local Zones, or
Wavelength Zones from which Amazon Web Services advertises IP addresses.
Use this parameter to limit the IP address to this location. IP
addresses cannot move between network border groups. \n Use DescribeAvailabilityZones
(https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html)
to view the network border groups. \n You cannot use a network border
group with EC2 Classic. If you attempt this operation on EC2 Classic,
you receive an InvalidParameterCombination error."
description: |-
A unique set of Availability Zones, Local Zones, or Wavelength Zones from
which Amazon Web Services advertises IP addresses. Use this parameter to
limit the IP address to this location. IP addresses cannot move between network
border groups.
Use DescribeAvailabilityZones (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html)
to view the network border groups.
You cannot use a network border group with EC2 Classic. If you attempt this
operation on EC2 Classic, you receive an InvalidParameterCombination error.
type: string
publicIPv4Pool:
description: The ID of an address pool that you own. Use this parameter
to let Amazon EC2 select an address from the address pool. To specify
a specific address from the address pool, use the Address parameter
instead.
description: |-
The ID of an address pool that you own. Use this parameter to let Amazon
EC2 select an address from the address pool. To specify a specific address
from the address pool, use the Address parameter instead.
type: string
tags:
description: The tags. The value parameter is required, but if you
don't want the tag to have a value, specify the parameter with no
value, and we set the value to an empty string.
description: |-
The tags. The value parameter is required, but if you don't want the tag
to have a value, specify the parameter with no value, and we set the value
to an empty string.
items:
description: Describes a tag.
properties:
Expand All @@ -85,24 +97,26 @@ spec:
description: ElasticIPAddressStatus defines the observed state of ElasticIPAddress
properties:
ackResourceMetadata:
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
member that is used to contain resource sync state, account ownership,
description: |-
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
that is used to contain resource sync state, account ownership,
constructed ARN for the resource
properties:
arn:
description: 'ARN is the Amazon Resource Name for the resource.
This is a globally-unique identifier and is set only by the
ACK service controller once the controller has orchestrated
the creation of the resource OR when it has verified that an
"adopted" resource (a resource where the ARN annotation was
set by the Kubernetes user on the CR) exists and matches the
supplied CR''s Spec field values. TODO(vijat@): Find a better
strategy for resources that do not have ARN in CreateOutputResponse
https://github.com/aws/aws-controllers-k8s/issues/270'
description: |-
ARN is the Amazon Resource Name for the resource. This is a
globally-unique identifier and is set only by the ACK service controller
once the controller has orchestrated the creation of the resource OR
when it has verified that an "adopted" resource (a resource where the
ARN annotation was set by the Kubernetes user on the CR) exists and
matches the supplied CR's Spec field values.
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
https://github.com/aws/aws-controllers-k8s/issues/270
type: string
ownerAccountID:
description: OwnerAccountID is the AWS Account ID of the account
that owns the backend AWS service API resource.
description: |-
OwnerAccountID is the AWS Account ID of the account that owns the
backend AWS service API resource.
type: string
region:
description: Region is the AWS region in which the resource exists
Expand All @@ -113,24 +127,26 @@ spec:
- region
type: object
allocationID:
description: '[EC2-VPC] The ID that Amazon Web Services assigns to
represent the allocation of the Elastic IP address for use with
instances in a VPC.'
description: |-
[EC2-VPC] The ID that Amazon Web Services assigns to represent the allocation
of the Elastic IP address for use with instances in a VPC.
type: string
carrierIP:
description: The carrier IP address. This option is only available
for network interfaces which reside in a subnet in a Wavelength
Zone (for example an EC2 instance).
description: |-
The carrier IP address. This option is only available for network interfaces
which reside in a subnet in a Wavelength Zone (for example an EC2 instance).
type: string
conditions:
description: All CRS managed by ACK have a common `Status.Conditions`
member that contains a collection of `ackv1alpha1.Condition` objects
that describe the various terminal states of the CR and its backend
AWS service API resource
description: |-
All CRS managed by ACK have a common `Status.Conditions` member that
contains a collection of `ackv1alpha1.Condition` objects that describe
the various terminal states of the CR and its backend AWS service API
resource
items:
description: Condition is the common struct used by all CRDs managed
by ACK service controllers to indicate terminal states of the
CR and its backend AWS service API resource
description: |-
Condition is the common struct used by all CRDs managed by ACK service
controllers to indicate terminal states of the CR and its backend AWS
service API resource
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
Expand Down
Loading

0 comments on commit 7493140

Please sign in to comment.