Skip to content

Commit

Permalink
Update to ACK runtime v0.39.0, code-generator v0.39.1 (#228)
Browse files Browse the repository at this point in the history 
### 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 `v1.2.26` to `v1.2.27`

Once this PR is merged, release `v1.2.27` 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.27
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 Oct 10, 2024
1 parent bd45cde commit 71c4318
Show file tree
Hide file tree
Showing 45 changed files with 213 additions and 970 deletions.
10 changes: 5 additions & 5 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ack_generate_info:
build_date: "2024-09-20T17:31:34Z"
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
go_version: go1.22.6
version: v0.38.1
build_date: "2024-10-10T04:00:51Z"
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
go_version: go1.23.2
version: v0.39.1
api_directory_checksum: 585098fc7c99c27ca523f83e860107d22aaa5a10
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
generator_config_info:
file_checksum: e2492ec6f4965b990edb66e08a625d990b8f8f30
file_checksum: cd7df4af2cf851dbae7c054c499c3c251064ab0c
original_file_name: generator.yaml
last_modification:
reason: API generation
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.26
newTag: 1.2.27
6 changes: 2 additions & 4 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,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: dhcpoptions.ec2.services.k8s.aws
spec:
group: ec2.services.k8s.aws
Expand Down Expand Up @@ -44,7 +44,6 @@ spec:
description: |-
DhcpOptionsSpec defines the desired state of DhcpOptions.
Describes a set of DHCP options.
properties:
dhcpConfigurations:
Expand Down Expand Up @@ -81,7 +80,7 @@ spec:
items:
description: "AWSResourceReferenceWrapper provides a wrapper around
*AWSResourceReference\ntype to provide more user friendly syntax
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
\ name: my-api"
properties:
from:
Expand Down Expand Up @@ -116,7 +115,6 @@ spec:
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:
Expand Down
5 changes: 1 addition & 4 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,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: elasticipaddresses.ec2.services.k8s.aws
spec:
group: ec2.services.k8s.aws
Expand Down Expand Up @@ -64,11 +64,9 @@ spec:
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
Expand Down Expand Up @@ -110,7 +108,6 @@ spec:
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:
Expand Down
13 changes: 1 addition & 12 deletions config/crd/bases/ec2.services.k8s.aws_flowlogs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: flowlogs.ec2.services.k8s.aws
spec:
group: ec2.services.k8s.aws
Expand Down Expand Up @@ -40,15 +40,13 @@ spec:
description: |-
FlowLogSpec defines the desired state of FlowLog.
Describes a flow log.
properties:
deliverLogsPermissionARN:
description: |-
The ARN for the IAM role that permits Amazon EC2 to publish flow logs to
a CloudWatch Logs log group in your account.
If you specify LogDestinationType as s3, do not specify DeliverLogsPermissionArn
or LogGroupName.
type: string
Expand All @@ -68,13 +66,11 @@ spec:
can be published to a CloudWatch Logs log group or an Amazon S3 bucket. The
value specified for this parameter depends on the value specified for LogDestinationType.
If LogDestinationType is not specified or cloud-watch-logs, specify the Amazon
Resource Name (ARN) of the CloudWatch Logs log group. For example, to publish
to a log group called my-logs, specify arn:aws:logs:us-east-1:123456789012:log-group:my-logs.
Alternatively, use LogGroupName instead.
If LogDestinationType is s3, specify the ARN of the Amazon S3 bucket. You
can also specify a subfolder in the bucket. To specify a subfolder in the
bucket, use the following ARN format: bucket_ARN/subfolder_name/. For example,
Expand All @@ -89,11 +85,9 @@ spec:
log data to CloudWatch Logs, specify cloud-watch-logs. To publish flow log
data to Amazon S3, specify s3.
If you specify LogDestinationType as s3, do not specify DeliverLogsPermissionArn
or LogGroupName.
Default: cloud-watch-logs
type: string
logFormat:
Expand All @@ -103,7 +97,6 @@ spec:
If you omit this parameter, the flow log is created using the default format.
If you specify this parameter, you must specify at least one field.
Specify the fields using the ${field-id} format, separated by spaces. For
the CLI, surround this parameter value with single quotes on Linux or double
quotes on Windows.
Expand All @@ -113,7 +106,6 @@ spec:
The name of a new or existing CloudWatch Logs log group where Amazon EC2
publishes your flow logs.
If you specify LogDestinationType as s3, do not specify DeliverLogsPermissionArn
or LogGroupName.
type: string
Expand All @@ -123,12 +115,10 @@ spec:
aggregated into a flow log record. You can specify 60 seconds (1 minute)
or 600 seconds (10 minutes).
When a network interface is attached to a Nitro-based instance (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances),
the aggregation interval is always 60 seconds or less, regardless of the
value that you specify.
Default: 600
format: int64
type: integer
Expand Down Expand Up @@ -179,7 +169,6 @@ spec:
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:
Expand Down
29 changes: 1 addition & 28 deletions config/crd/bases/ec2.services.k8s.aws_instances.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: instances.ec2.services.k8s.aws
spec:
group: ec2.services.k8s.aws
Expand Down Expand Up @@ -44,7 +44,6 @@ spec:
description: |-
InstanceSpec defines the desired state of Instance.
Describes an instance.
properties:
blockDeviceMappings:
Expand Down Expand Up @@ -131,10 +130,8 @@ spec:
For more information, see Burstable performance instances (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html)
in the Amazon EC2 User Guide.
Default: standard (T2 instances) or unlimited (T3/T3a/T4g instances)
For T3 instances with host tenancy, only standard is supported.
properties:
cpuCredits:
Expand All @@ -153,7 +150,6 @@ spec:
Alternatively, if you set InstanceInitiatedShutdownBehavior to terminate,
you can terminate the instance by running the shutdown command from the instance.
Default: false
type: boolean
ebsOptimized:
Expand All @@ -164,7 +160,6 @@ spec:
available with all instance types. Additional usage charges apply when using
an EBS-optimized instance.
Default: false
type: boolean
elasticGPUSpecification:
Expand All @@ -186,7 +181,6 @@ spec:
inference accelerators are a resource you can attach to your Amazon EC2 instances
to accelerate your Deep Learning (DL) inference workloads.
You cannot specify accelerators from different generations in the same request.
items:
description: Describes an elastic inference accelerator.
Expand All @@ -204,7 +198,6 @@ spec:
For more information, see What is Amazon Web Services Nitro Enclaves? (https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave.html)
in the Amazon Web Services Nitro Enclaves User Guide.
You can't enable Amazon Web Services Nitro Enclaves and hibernation on the
same instance.
properties:
Expand All @@ -217,7 +210,6 @@ spec:
see Hibernate your instance (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html)
in the Amazon EC2 User Guide.
You can't enable hibernation and Amazon Web Services Nitro Enclaves on the
same instance.
properties:
Expand All @@ -243,14 +235,12 @@ spec:
Indicates whether an instance stops or terminates when you initiate shutdown
from the instance (using the operating system command for system shutdown).
Default: stop
type: string
instanceMarketOptions:
description: |-
The market (purchasing) option for the instances.
For RunInstances, persistent Spot Instance requests are only supported when
InstanceInterruptionBehavior is set to either hibernate or stop.
properties:
Expand Down Expand Up @@ -278,7 +268,6 @@ spec:
The instance type. For more information, see Instance types (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html)
in the Amazon EC2 User Guide.
Default: m1.small
type: string
ipv6AddressCount:
Expand All @@ -289,7 +278,6 @@ spec:
in the same request. You can specify this option if you've specified a minimum
number of instances to launch.
You cannot specify this option and the network interfaces option in the same
request.
format: int64
Expand All @@ -301,7 +289,6 @@ spec:
to assign a number of IPv6 addresses in the same request. You cannot specify
this option if you've specified a minimum number of instances to launch.
You cannot specify this option and the network interfaces option in the same
request.
items:
Expand All @@ -315,7 +302,6 @@ spec:
description: |-
The ID of the kernel.
We recommend that you use PV-GRUB instead of kernels and RAM disks. For more
information, see PV-GRUB (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html)
in the Amazon EC2 User Guide.
Expand All @@ -325,7 +311,6 @@ spec:
The name of the key pair. You can create a key pair using CreateKeyPair (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateKeyPair.html)
or ImportKeyPair (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportKeyPair.html).
If you do not specify a key pair, you can't connect to the instance unless
you choose an AMI that is configured to allow users another way to log in.
type: string
Expand Down Expand Up @@ -363,7 +348,6 @@ spec:
than Amazon EC2 can launch in the target Availability Zone, Amazon EC2 launches
the largest possible number of instances above MinCount.
Constraints: Between 1 and the maximum number you're allowed for the specified
instance type. For more information about the default limits, and how to
request an increase, see How many instances can I run in Amazon EC2 (http://aws.amazon.com/ec2/faqs/#How_many_instances_can_I_run_in_Amazon_EC2)
Expand Down Expand Up @@ -393,7 +377,6 @@ spec:
is more instances than Amazon EC2 can launch in the target Availability Zone,
Amazon EC2 launches no instances.
Constraints: Between 1 and the maximum number you're allowed for the specified
instance type. For more information about the default limits, and how to
request an increase, see How many instances can I run in Amazon EC2 (http://aws.amazon.com/ec2/faqs/#How_many_instances_can_I_run_in_Amazon_EC2)
Expand Down Expand Up @@ -526,13 +509,11 @@ spec:
[EC2-VPC] The primary IPv4 address. You must specify a value from the IPv4
address range of the subnet.
Only one private IP address can be designated as primary. You can't specify
this option if you've specified the option to designate a private IP address
as the primary IP address in a network interface specification. You cannot
specify this option if you're launching more than one instance in the request.
You cannot specify this option and the network interfaces option in the same
request.
type: string
Expand All @@ -543,7 +524,6 @@ spec:
need to specify a RAM disk. To find kernel requirements, go to the Amazon
Web Services Resource Center and search for the kernel ID.
We recommend that you use PV-GRUB instead of kernels and RAM disks. For more
information, see PV-GRUB (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html)
in the Amazon EC2 User Guide.
Expand All @@ -553,7 +533,6 @@ spec:
The IDs of the security groups. You can create a security group using CreateSecurityGroup
(https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html).
If you specify a network interface, you must specify any security groups
as part of the network interface.
items:
Expand All @@ -564,11 +543,9 @@ spec:
[EC2-Classic, default VPC] The names of the security groups. For a nondefault
VPC, you must use security group IDs instead.
If you specify a network interface, you must specify any security groups
as part of the network interface.
Default: Amazon EC2 uses the default security group.
items:
type: string
Expand All @@ -577,7 +554,6 @@ spec:
description: |-
[EC2-VPC] The ID of the subnet to launch the instance into.
If you specify a network interface, you must specify any subnets as part
of the network interface.
type: string
Expand Down Expand Up @@ -622,7 +598,6 @@ spec:
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:
Expand Down Expand Up @@ -774,7 +749,6 @@ spec:
DNS hostname can only be used inside the Amazon EC2 network. This name is
not available until the instance enters the running state.
[EC2-VPC] The Amazon-provided DNS server resolves Amazon-provided private
DNS hostnames if you've enabled DNS resolution and DNS hostnames in your
VPC. If you are not using the Amazon-provided DNS server in your VPC, your
Expand Down Expand Up @@ -802,7 +776,6 @@ spec:
The public IPv4 address, or the Carrier IP address assigned to the instance,
if applicable.
A Carrier IP address only applies to an instance launched in a subnet associated
with a Wavelength Zone.
type: string
Expand Down
Loading

0 comments on commit 71c4318

Please sign in to comment.