Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Release.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "1.56.0"
version = "1.57.0"

[migrations]
"(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
Expand Down Expand Up @@ -461,3 +461,6 @@ version = "1.56.0"
"(1.55.0, 1.56.0)" = [
"migrate_v1.56.0_image-verifier-plugins-extensible.lz4"
]
"(1.56.0, 1.57.0)" = [
"migrate_v1.57.0_kubernetes-topology-manager-policy-options.lz4"
]
8 changes: 4 additions & 4 deletions Twoliter.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ digest = "0da2D/aLHDvYzL2lbczeSGx2NphMukKUPMunpGPWBFY="

[[kit]]
name = "bottlerocket-core-kit"
version = "13.1.0"
vendor = "bottlerocket"
source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v13.1.0"
digest = "oNFE4+rBh2Js4koxIyxk05hRG9tetYjQc3FQaRWJET8="
version = "13.1.1"
vendor = "piyush"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes look like they're from local testing and should be removed.

source = "public.ecr.aws/s2v1a1q8/bottlerocket-core-kit:v13.1.1"
digest = "5+f5HLmQkjORQmhuL4aCZEyZ2VwjuaImxRkQa/Ylr/0="
9 changes: 6 additions & 3 deletions Twoliter.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
schema-version = 2
release-version = "1.56.0"
release-version = "1.57.0"
project-vendor = "Bottlerocket"

[vendor.bottlerocket]
registry = "public.ecr.aws/bottlerocket"

[vendor.piyush]
registry = "public.ecr.aws/s2v1a1q8"

[sdk]
name = "bottlerocket-sdk"
version = "0.70.0"
Expand All @@ -17,5 +20,5 @@ vendor = "bottlerocket"

[[kit]]
name = "bottlerocket-core-kit"
version = "13.1.0"
vendor = "bottlerocket"
version = "13.1.1"
vendor = "piyush"
83 changes: 45 additions & 38 deletions sources/Cargo.lock

Large diffs are not rendered by default.

25 changes: 13 additions & 12 deletions sources/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ members = [
"settings-migrations/v1.54.0/kubelet-device-plugins-mps-settings",
"settings-migrations/v1.54.0/kubelet-device-plugins-mps-prefix-settings",
"settings-migrations/v1.56.0/image-verifier-plugins-extensible",
"settings-migrations/v1.57.0/kubernetes-topology-manager-policy-options",

"settings-plugins/aws-dev",
"settings-plugins/aws-ecs-2",
Expand Down Expand Up @@ -124,28 +125,28 @@ url = "2"
walkdir = "2"

[workspace.dependencies.bottlerocket-defaults-helper]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.21.0"
git = "https://github.com/piyush-jena/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.22.0"
version = "0.1.1"

[workspace.dependencies.bottlerocket-modeled-types]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.21.0"
version = "0.14.0"
git = "https://github.com/piyush-jena/bottlerocket-settings-sdk"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should point to https://github.com/bottlerocket-os/bottlerocket-settings-sdk, not the personal fork. Applies to other places.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because the settings sdk is not released yet. For that reason, let's move the PR to draft first. @piyush-jena

tag = "bottlerocket-settings-models-v0.22.0"
version = "0.15.0"

[workspace.dependencies.bottlerocket-settings-models]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.21.0"
version = "0.21.0"
git = "https://github.com/piyush-jena/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.22.0"
version = "0.22.0"

[workspace.dependencies.bottlerocket-settings-plugin]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.21.0"
git = "https://github.com/piyush-jena/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.22.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.21.0"
git = "https://github.com/piyush-jena/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.22.0"
version = "0.1.0"

[profile.release]
Expand Down
1 change: 1 addition & 0 deletions sources/deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,5 @@ allow-git = [
# We will allow it as an exception until the following is resolved:
# https://github.com/bottlerocket-os/bottlerocket-settings-sdk/issues/18
"https://github.com/bottlerocket-os/bottlerocket-settings-sdk",
"https://github.com/piyush-jena/bottlerocket-settings-sdk",
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[package]
name = "kubernetes-topology-manager-policy-options"
version = "0.1.0"
license = "Apache-2.0 OR MIT"
edition = "2021"
publish = false
exclude = ["README.md"]

[dependencies]
migration-helpers.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
use migration_helpers::common_migrations::AddSettingsMigration;
use migration_helpers::{migrate, Result};
use std::process;

// Added new kubernetes topology manager policy options settings.
fn run() -> Result<()> {
migrate(AddSettingsMigration(&[
"settings.kubernetes.topology-manager-policy-options",
"settings.kubernetes.topology-manager-policy-options.prefer-closest-numa-nodes",
"settings.kubernetes.topology-manager-policy-options.max-allowable-numa-nodes",
]))
}

fn main() {
if let Err(e) = run() {
eprintln!("{e}");
process::exit(1);
}
}
Loading