Merge pull request #4661 from koooosh/develop

Re-add reserved pid settings migration + bump core-kit to 10.7.1

Author: koooosh

Release.toml

@@ -1,4 +1,4 @@
-version = "1.49.0"
+version = "1.50.0"
 
 [migrations]
 "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -441,5 +441,7 @@ version = "1.49.0"
     "migrate_v1.47.0_container-runtime-concurrent-download-chunk-size.lz4",
     "migrate_v1.47.0_host-bootstrap-containers-command-setting.lz4"
 ]
-"(1.47.0, 1.48.0)" = []
 "(1.48.0, 1.49.0)" = []
+"(1.49.0, 1.50.0)" = [
+    "migrate_v1.50.0_kubernetes-reserved-pid-settings.lz4",
+]

Twoliter.lock

@@ -17,7 +17,7 @@ digest = "hj2a36Z678mer4x3ItzVVqL4VZPVLvSG0mVI+kRqfNY="
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "10.6.0"
+version = "10.7.1"
 vendor = "bottlerocket"
-source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v10.6.0"
-digest = "qHfA7kRBsSDPOvgQGOg5besQUmvPNaszPszMTZMjjHQ="
+source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v10.7.1"
+digest = "0TTDnEa4cEzjiZfhCiqV/UQ6xC/dV+YFZ/Ytfo7KU5Y="

Twoliter.toml

@@ -1,5 +1,5 @@
 schema-version = 2
-release-version = "1.49.0"
+release-version = "1.50.0"
 project-vendor = "Bottlerocket"
 
 [vendor.bottlerocket]
@@ -17,5 +17,5 @@ vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "10.6.0"
+version = "10.7.1"
 vendor = "bottlerocket"

sources/Cargo.lock

@@ -44,6 +44,7 @@ members = [
     "settings-migrations/v1.46.0/kubernetes-static-pods-enabled-setting",
     "settings-migrations/v1.47.0/container-runtime-concurrent-download-chunk-size",
     "settings-migrations/v1.47.0/host-bootstrap-containers-command-setting",
+    "settings-migrations/v1.50.0/kubernetes-reserved-pid-settings",
 
     "settings-plugins/aws-dev",
     "settings-plugins/aws-ecs-2",
@@ -112,27 +113,27 @@ walkdir = "2"
 
 [workspace.dependencies.bottlerocket-defaults-helper]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.15.0"
+tag = "bottlerocket-settings-models-v0.16.0"
 version = "0.1.1"
 
 [workspace.dependencies.bottlerocket-modeled-types]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.15.0"
-version = "0.11.0"
+tag = "bottlerocket-settings-models-v0.16.0"
+version = "0.12.0"
 
 [workspace.dependencies.bottlerocket-settings-models]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.15.0"
-version = "0.15.0"
+tag = "bottlerocket-settings-models-v0.16.0"
+version = "0.16.0"
 
 [workspace.dependencies.bottlerocket-settings-plugin]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.15.0"
+tag = "bottlerocket-settings-models-v0.16.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.15.0"
+tag = "bottlerocket-settings-models-v0.16.0"
 version = "0.1.0"
 
 [profile.release]

sources/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "kubernetes-reserved-pid-settings"
+version = "0.1.0"
+authors = ["Kush Upadhyay <kushupad@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"]
+
+[dependencies]
+migration-helpers.workspace = true

sources/settings-migrations/v1.50.0/kubernetes-reserved-pid-settings/Cargo.toml

@@ -0,0 +1,21 @@
+use migration_helpers::common_migrations::AddSettingsMigration;
+use migration_helpers::{migrate, Result};
+use std::process;
+
+// We added new kubernetes settings to reserve pids for kubernetes and system components.
+fn run() -> Result<()> {
+    migrate(AddSettingsMigration(&[
+        "settings.kubernetes.kube-reserved.pid",
+        "settings.kubernetes.system-reserved.pid",
+    ]))
+}
+
+// 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);
+    }
+}