Merge pull request #4628 from vigh-m/static-pods-enabled-migrations

Prepare the 1.46.0 release

Author: vigh-m

CHANGELOG.md

@@ -1,3 +1,25 @@
+# v1.46.0 (2025-09-02)
+
+## Release Highlights
+* Add support for new Kubernetes setting `static-pods-enabled` ([bottlerocket-core-kit#641])
+* Add default bind directories for ephemeral storage ([bottlerocket-core-kit#632])
+
+## OS Changes
+* Update `bottlerocket-sdk` from 0.63.0 to 0.64.0 ([commits](https://github.com/bottlerocket-os/bottlerocket-sdk/compare/v0.63.0...v0.64.0))([#4623])
+* Update `bottlerocket-core-kit` from 10.1.2 to 10.3.0 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-core-kit/blob/develop/CHANGELOG.md#v1030-2025-08-26) ([commits](https://github.com/bottlerocket-os/bottlerocket-core-kit/compare/v10.1.2...v10.3.0)) ([#4623], [#4628])
+* Update `bottlerocket-kernel-kit` from 4.0.1 to 4.2.0 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-kernel-kit/blob/develop/CHANGELOG.md#v420-2025-08-25) ([commits](https://github.com/bottlerocket-os/bottlerocket-kernel-kit/compare/v4.0.1...v4.2.0)) ([#4623], [#4626])
+
+## Build Changes
+### Twoliter
+* Update `twoliter` from 0.11.0 to 0.12.0 and schema-version to 2 [CHANGELOG](https://github.com/bottlerocket-os/twoliter/blob/develop/CHANGELOG.md#0120---2025-08-21) ([commits](https://github.com/bottlerocket-os/twoliter/compare/v0.11.0...v0.12.0)) ([#4624])
+
+[#4623]: https://github.com/bottlerocket-os/bottlerocket/pull/4623
+[#4624]: https://github.com/bottlerocket-os/bottlerocket/pull/4624
+[#4626]: https://github.com/bottlerocket-os/bottlerocket/pull/4626
+[#4628]: https://github.com/bottlerocket-os/bottlerocket/pull/4628
+[bottlerocket-core-kit#632]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/632
+[bottlerocket-core-kit#641]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/641
+
 # v1.45.0 (2025-08-18)
 
 ## Release Highlights

Release.toml

@@ -1,4 +1,4 @@
-version = "1.45.0"
+version = "1.46.0"
 
 [migrations]
 "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -434,3 +434,6 @@ version = "1.45.0"
     "migrate_v1.44.0_container-runtime-snapshotter-setting.lz4",
 ]
 "(1.44.0, 1.45.0)" = []
+"(1.45.0, 1.46.0)" = [
+    "migrate_v1.46.0_kubernetes-static-pods-enabled-setting.lz4",
+]

Twoliter.lock

@@ -17,7 +17,7 @@ digest = "hl4lWZ9WFncH72ZaZ06WOu0yg5dL1Y8/VzWwaOjJu8g="
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "10.2.0"
+version = "10.3.0"
 vendor = "bottlerocket"
-source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v10.2.0"
-digest = "8ncIwZGGIjYsTedHkc7i0Ul7NRyc384tUBQ1vUJwJ7A="
+source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v10.3.0"
+digest = "dT7bsoCAZmBVFw7Us7PcMHQg5ru47B6aLM5G6+mmDaQ="

Twoliter.toml

@@ -1,5 +1,5 @@
 schema-version = 2
-release-version = "1.45.0"
+release-version = "1.46.0"
 project-vendor = "Bottlerocket"
 
 [vendor.bottlerocket]
@@ -17,5 +17,5 @@ vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "10.2.0"
+version = "10.3.0"
 vendor = "bottlerocket"

sources/Cargo.lock

@@ -38,6 +38,7 @@ members = [
     "settings-migrations/v1.42.0/kubernetes-memory-swap-behavior-setting",
     "settings-migrations/v1.44.0/container-runtime-plugins-settings",
     "settings-migrations/v1.44.0/container-runtime-snapshotter-setting",
+    "settings-migrations/v1.46.0/kubernetes-static-pods-enabled-setting",
 
     "settings-plugins/aws-dev",
     "settings-plugins/aws-ecs-2",
@@ -106,27 +107,27 @@ walkdir = "2"
 
 [workspace.dependencies.bottlerocket-defaults-helper]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-defaults-helper-v0.1.0"
-version = "0.1.0"
+tag = "bottlerocket-settings-models-v0.13.0"
+version = "0.1.1"
 
 [workspace.dependencies.bottlerocket-modeled-types]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.12.0"
+tag = "bottlerocket-settings-models-v0.13.0"
 version = "0.10.0"
 
 [workspace.dependencies.bottlerocket-settings-models]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.12.0"
-version = "0.12.0"
+tag = "bottlerocket-settings-models-v0.13.0"
+version = "0.13.0"
 
 [workspace.dependencies.bottlerocket-settings-plugin]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.12.0"
+tag = "bottlerocket-settings-models-v0.13.0"
 version = "0.1.0"
 
 [workspace.dependencies.settings-extension-oci-defaults]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.12.0"
+tag = "bottlerocket-settings-models-v0.13.0"
 version = "0.1.0"
 
 [profile.release]

sources/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "kubernetes-static-pods-enabled-setting"
+version = "0.1.0"
+authors = ["Vighnesh Maheshwari <vighmah@amazon.com>"]
+license = "Apache-2.0 OR MIT"
+edition = "2021"
+publish = false
+# Don't rebuild crate just because of changes to README.
+exclude = ["README.md"]
+
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+migration-helpers.workspace = true
+snafu.workspace = true
+
+[dev-dependencies]
+maplit.workspace = true

sources/settings-migrations/v1.46.0/kubernetes-static-pods-enabled-setting/Cargo.toml

@@ -0,0 +1,21 @@
+use migration_helpers::common_migrations::AddSettingsMigration;
+use migration_helpers::{migrate, Result};
+use std::process;
+
+/// We added new k8s settings for:
+/// - static_pods_enabled
+fn run() -> Result<()> {
+    migrate(AddSettingsMigration(&[
+        "settings.kubernetes.static-pods-enabled",
+    ]))
+}
+
+// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
+// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
+// https://github.com/shepmaster/snafu/issues/110
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{e}");
+        process::exit(1);
+    }
+}