Skip to content

Commit 205eecd

Browse files
build(deps): Bump sigs.k8s.io/cluster-api-provider-aws/v2 from 2.9.0 to 2.9.1 in /hack/third-party/capa (#1301)
Bumps [sigs.k8s.io/cluster-api-provider-aws/v2](https://github.com/kubernetes-sigs/cluster-api-provider-aws) from 2.9.0 to 2.9.1. <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.9.1</h2> <h1>Release notes for Cluster API Provider AWS (CAPA) v2.9.1</h1> <p><a href="https://cluster-api-aws.sigs.k8s.io/">Documentation</a></p> <h1>Changelog since v2.9.0</h1> <h2>Urgent Upgrade Notes</h2> <h3>(No, really, you MUST read this before you upgrade)</h3> <ul> <li>The short name for <strong>AWSManagedClusterTemplate</strong> has changed from <code>amct</code> to <code>awsmct</code>. <!-- raw HTML omitted --><strong>If you have any automation that relies on the short name, it will need to be updated</strong><!-- raw HTML omitted -->. (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5663">#5663</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</li> </ul> <h2>Changes by Kind</h2> <h3>Bug or Regression</h3> <ul> <li>Fix: disallow setting of <code>CapacityReservationPreference: CapacityReservationsOnly</code> when <code>MarketType: Spot</code> or <code>SpotMarketOptions</code> is set (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5633">#5633</a>, <a href="https://github.com/BraeTroutman"><code>@​BraeTroutman</code></a>)</li> </ul> <h3>Uncategorized</h3> <ul> <li>Add Metadata kind to metadata (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5639">#5639</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</li> <li>Add support for 'eus' channelGroupType in ROSA provider (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5665">#5665</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</li> <li>Disable defaulting for .spec.ignition.version when <code>.spec.ignition.storageType</code> is set to <code>UnencryptedUserData</code> (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5644">#5644</a>, <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a>)</li> <li>The clusterawsadm print-policy command now prints all the policies in the template generated by the print-cloudformation-template command, and when it outputs multiple policies, the output is valid JSON. (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5658">#5658</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: <code>registry.k8s.io/cluster-api-aws/cluster-api-aws-controller:v2.9.1</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/9c1704975705d44b74fa4a1dc3b9a37e6f4d95e2"><code>9c17049</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5665">#5665</a> from k8s-infra-cherrypick-robot/cherry-pick-5651-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/42cf3bfe9fc11f2a4b8e75f1ac07a3225aa28b38"><code>42cf3bf</code></a> feat: add support for 'eus' channelGroupType in ROSA provider</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/6066097a1e1f9a16d2799c98a74d0e0be30beae8"><code>6066097</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5663">#5663</a> from k8s-infra-cherrypick-robot/cherry-pick-5662-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/5fa83599b22980090277b5cce5455ce1ea1b1b9a"><code>5fa8359</code></a> Fix AWSManagedClusterTemplate short name</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/41f5640827051e8e15f8017d39fa0d38194eac56"><code>41f5640</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5658">#5658</a> from k8s-infra-cherrypick-robot/cherry-pick-5654-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/4b9f9fdcdd368754e47c56abbdd2e56b21d67f17"><code>4b9f9fd</code></a> bug: Make print-policy consistent with print-cloudformation-template</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/b40da3f72358143bc70f4bfd4556348a641057e0"><code>b40da3f</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5648">#5648</a> from k8s-infra-cherrypick-robot/cherry-pick-5647-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/54f749fb1ba8649961258c9b5c7007d73832f3fe"><code>54f749f</code></a> Fix ignition version defaulting to consider if the storageType gets defaulted...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/d02a5f86ee08077ab130ff78940938b58f7a7c3d"><code>d02a5f8</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5644">#5644</a> from k8s-infra-cherrypick-robot/cherry-pick-5641-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/cf09fee7b1eedcd51b30c9fe0eaab5d079b72794"><code>cf09fee</code></a> Fix(ignition): Default version only if not storageType UnencryptedUserData</li> <li>Additional commits viewable in <a href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/compare/v2.9.0...v2.9.1">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.9.0&new-version=2.9.1)](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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jimmi Dyson <[email protected]>
1 parent 779297d commit 205eecd

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,10 @@ type CloudInit struct {
286286
// For more information on Ignition configuration, see https://coreos.github.io/butane/specs/
287287
type Ignition struct {
288288
// Version defines which version of Ignition will be used to generate bootstrap data.
289+
// Defaults to `2.3` if storageType is set to `ClusterObjectStore`.
290+
// It will be ignored if storageType is set to `UnencryptedUserData`, as the userdata defines its own version.
289291
//
290292
// +optional
291-
// +kubebuilder:default="2.3"
292293
// +kubebuilder:validation:Enum="2.3";"3.0";"3.1";"3.2";"3.3";"3.4"
293294
Version string `json:"version,omitempty"`
294295

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type AWSManagedClusterTemplateSpec struct {
2626
}
2727

2828
// +kubebuilder:object:root=true
29-
// +kubebuilder:resource:path=awsmanagedclustertemplates,scope=Namespaced,categories=cluster-api,shortName=amct
29+
// +kubebuilder:resource:path=awsmanagedclustertemplates,scope=Namespaced,categories=cluster-api,shortName=awsmct
3030
// +kubebuilder:storageversion
3131

3232
// AWSManagedClusterTemplate is the Schema for the AWSManagedClusterTemplates API.

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.23.1
77

88
toolchain go1.24.4
99

10-
require sigs.k8s.io/cluster-api-provider-aws/v2 v2.9.0
10+
require sigs.k8s.io/cluster-api-provider-aws/v2 v2.9.1
1111

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

hack/third-party/capa/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
203203
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
204204
sigs.k8s.io/cluster-api v1.10.2 h1:xfvtNu4Fy/41grL0ryH5xSKQjpJEWdO8HiV2lPCCozQ=
205205
sigs.k8s.io/cluster-api v1.10.2/go.mod h1:/b9Un5Imprib6S7ZOcJitC2ep/5wN72b0pXpMQFfbTw=
206-
sigs.k8s.io/cluster-api-provider-aws/v2 v2.9.0 h1:oP4GkhI4K/STwtt/Uzt6UdOnn+xMXhk7v3BJfr+dSx4=
207-
sigs.k8s.io/cluster-api-provider-aws/v2 v2.9.0/go.mod h1:wdqD8SRkgbIAoj0L2geEItos4X4xmCr8yQpEOqIwLp4=
206+
sigs.k8s.io/cluster-api-provider-aws/v2 v2.9.1 h1:VQT0hJ5wbD3qS3icucjMfpBWkc1gpIuXYsOAG6Kw25A=
207+
sigs.k8s.io/cluster-api-provider-aws/v2 v2.9.1/go.mod h1:wdqD8SRkgbIAoj0L2geEItos4X4xmCr8yQpEOqIwLp4=
208208
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
209209
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
210210
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

0 commit comments

Comments
 (0)