From 3724c2738bb2535dfdd4e2ec1e1ba97291a72a81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 03:35:54 +0000 Subject: [PATCH 1/2] build(deps): Bump sigs.k8s.io/cluster-api-provider-aws/v2 Bumps [sigs.k8s.io/cluster-api-provider-aws/v2](https://github.com/kubernetes-sigs/cluster-api-provider-aws) from 2.8.3 to 2.8.4. - [Release notes](https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases) - [Changelog](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/.goreleaser.yaml) - [Commits](https://github.com/kubernetes-sigs/cluster-api-provider-aws/compare/v2.8.3...v2.8.4) --- updated-dependencies: - dependency-name: sigs.k8s.io/cluster-api-provider-aws/v2 dependency-version: 2.8.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- hack/third-party/capa/go.mod | 2 +- hack/third-party/capa/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/third-party/capa/go.mod b/hack/third-party/capa/go.mod index bec3c6db0..f2dcf23ca 100644 --- a/hack/third-party/capa/go.mod +++ b/hack/third-party/capa/go.mod @@ -7,7 +7,7 @@ go 1.22.0 toolchain go1.24.1 -require sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.3 +require sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.4 require ( github.com/aws/aws-sdk-go v1.55.5 // indirect diff --git a/hack/third-party/capa/go.sum b/hack/third-party/capa/go.sum index 2122c8ab2..6f3bafadc 100644 --- a/hack/third-party/capa/go.sum +++ b/hack/third-party/capa/go.sum @@ -192,8 +192,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M= sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8= -sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.3 h1:Mp7UJlcmKMjTvMmgSn6yqjDOYqy/Y7fV4e7fy2wpQm8= -sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.3/go.mod h1:ubZXYyieYt+I4jQFJ47J9Hq4W3zPernTWXlIfIZnB3Y= +sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.4 h1:Qhedvgjob/4dObhNdI3zK6Ekp6MdQP8ce4vF/p0TXlw= +sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.4/go.mod h1:ubZXYyieYt+I4jQFJ47J9Hq4W3zPernTWXlIfIZnB3Y= sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo= sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= From 02b92b99a68f43b5e12e56422bb4b6ca5ba211da Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Mon, 30 Jun 2025 08:53:13 -0700 Subject: [PATCH 2/2] build: update AWS API --- .../cluster-api-provider-aws/v2/api/v1beta2/types.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go index bee54a9f0..9c3c2771c 100644 --- a/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go +++ b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go @@ -54,7 +54,7 @@ type AMIReference struct { ID *string `json:"id,omitempty"` // EKSOptimizedLookupType If specified, will look up an EKS Optimized image in SSM Parameter store - // +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU + // +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU;AmazonLinux2023;AmazonLinux2023GPU // +optional EKSOptimizedLookupType *EKSAMILookupType `json:"eksLookupType,omitempty"` } @@ -463,6 +463,10 @@ const ( AmazonLinux EKSAMILookupType = "AmazonLinux" // AmazonLinuxGPU is the AmazonLinux GPU AMI type. AmazonLinuxGPU EKSAMILookupType = "AmazonLinuxGPU" + // AmazonLinux2023 is the AmazonLinux 2023 AMI type. + AmazonLinux2023 EKSAMILookupType = "AmazonLinux2023" + // AmazonLinux2023GPU is the AmazonLinux 2023 GPU AMI type. + AmazonLinux2023GPU EKSAMILookupType = "AmazonLinux2023GPU" ) // PrivateDNSName is the options for the instance hostname.