Skip to content

Commit 08aa66e

Browse files
build(deps): Bump sigs.k8s.io/cluster-api-provider-aws/v2 from 2.8.3 to 2.8.4 in /hack/third-party/capa (#1191)
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. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases">sigs.k8s.io/cluster-api-provider-aws/v2's releases</a>.</em></p> <blockquote> <h2>v2.8.4</h2> <h1>Release notes for Cluster API Provider AWS (CAPA) v2.8.4</h1> <p><a href="https://cluster-api-aws.sigs.k8s.io/">Documentation</a></p> <h1>Changelog since v2.8.3</h1> <h2>Urgent Upgrade Notes</h2> <h3>(No, really, you MUST read this before you upgrade)</h3> <p>Add missing permissions for controller. Its recommended that you update your CloudFormation stack. (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5539">#5539</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</p> <h2>Changes by Kind</h2> <h3>Uncategorized</h3> <ul> <li>Add machine pool template for Flatcar Linux (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5534">#5534</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</li> <li>Fix: Ignore conflict resolution and correctly compare configuration for AddOn reconciliation (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5501">#5501</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</li> <li>Fixed the default AMI lookup when using a bastion. (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5533">#5533</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</li> <li>✨ Added support for Amazon Linux 2023 and Amazon Linux 2023 GPU AMI lookup in EKS optimized AMI workflow. (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5555">#5555</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</li> <li>🐛 Fix missing CRD validation for Amazon Linux 2023 eksLookupType enum values, completing the AL2023 support introduced in v2.8. (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5566">#5566</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</li> </ul> <p>The images for this release are:</p> <p><code>registry.k8s.io/cluster-api-aws/cluster-api-aws-controller:v2.8.4</code></p> <p>Thanks to all our contributors.</p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/49658babd14cb9590f9fef8330243d530f7d6602"><code>49658ba</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5566">#5566</a> from k8s-infra-cherrypick-robot/cherry-pick-5558-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/8b4342697d3fe0114353be19f5f4dcecbd24c50e"><code>8b43426</code></a> remove v1beta api changes</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/377613bf87220194f6349436802147c1bf95e559"><code>377613b</code></a> Update types.go</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/6dd5a5443f7bc63ed50f1dfe5c889ae10f247775"><code>6dd5a54</code></a> Add support for AL2023 CRDs</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/2d900a1f6bf96980409a6abbcfcc27f1599454d1"><code>2d900a1</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5555">#5555</a> from k8s-infra-cherrypick-robot/cherry-pick-5517-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/b746a1041424a165c93df1527ab722ec6533297f"><code>b746a10</code></a> chore(lint): fix revive linter comment for AmazonLinux2023GPU</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/1333e8621d6eea56eedd1b8422cbfc94ea655270"><code>1333e86</code></a> fix: use arm param for eksARM64AmiAl2023SSMParameterFormat</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/367dac8ee9e8c5556f18694628f46153cc29313a"><code>367dac8</code></a> feat: add amazon-linux-2023 ami lookup parameters for ssm</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/bf04da0b16028d037e6a88c919649176ac5fa3e5"><code>bf04da0</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5539">#5539</a> from k8s-infra-cherrypick-robot/cherry-pick-5537-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/99c84b674d0d7d89e1003299906bd357004f3f9e"><code>99c84b6</code></a> fix: add eventually for bastion ready</li> <li>Additional commits viewable in <a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/compare/v2.8.3...v2.8.4">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sigs.k8s.io/cluster-api-provider-aws/v2&package-manager=go_modules&previous-version=2.8.3&new-version=2.8.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dimitri Koshkin <dimitri.koshkin@nutanix.com>
1 parent 63e5f6c commit 08aa66e

File tree

3 files changed

+8
-4
lines changed
  • api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2
  • hack/third-party/capa

3 files changed

+8
-4
lines changed

api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ type AMIReference struct {
5454
ID *string `json:"id,omitempty"`
5555

5656
// EKSOptimizedLookupType If specified, will look up an EKS Optimized image in SSM Parameter store
57-
// +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU
57+
// +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU;AmazonLinux2023;AmazonLinux2023GPU
5858
// +optional
5959
EKSOptimizedLookupType *EKSAMILookupType `json:"eksLookupType,omitempty"`
6060
}
@@ -463,6 +463,10 @@ const (
463463
AmazonLinux EKSAMILookupType = "AmazonLinux"
464464
// AmazonLinuxGPU is the AmazonLinux GPU AMI type.
465465
AmazonLinuxGPU EKSAMILookupType = "AmazonLinuxGPU"
466+
// AmazonLinux2023 is the AmazonLinux 2023 AMI type.
467+
AmazonLinux2023 EKSAMILookupType = "AmazonLinux2023"
468+
// AmazonLinux2023GPU is the AmazonLinux 2023 GPU AMI type.
469+
AmazonLinux2023GPU EKSAMILookupType = "AmazonLinux2023GPU"
466470
)
467471

468472
// PrivateDNSName is the options for the instance hostname.

hack/third-party/capa/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go 1.22.0
77

88
toolchain go1.24.1
99

10-
require sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.3
10+
require sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.4
1111

1212
require (
1313
github.com/aws/aws-sdk-go v1.55.5 // indirect

hack/third-party/capa/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
192192
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
193193
sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
194194
sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
195-
sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.3 h1:Mp7UJlcmKMjTvMmgSn6yqjDOYqy/Y7fV4e7fy2wpQm8=
196-
sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.3/go.mod h1:ubZXYyieYt+I4jQFJ47J9Hq4W3zPernTWXlIfIZnB3Y=
195+
sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.4 h1:Qhedvgjob/4dObhNdI3zK6Ekp6MdQP8ce4vF/p0TXlw=
196+
sigs.k8s.io/cluster-api-provider-aws/v2 v2.8.4/go.mod h1:ubZXYyieYt+I4jQFJ47J9Hq4W3zPernTWXlIfIZnB3Y=
197197
sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
198198
sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
199199
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

0 commit comments

Comments
 (0)