-
Notifications
You must be signed in to change notification settings - Fork 571
migrations: add migrations for prefer-closest-numa-nodes and max-allowable-numa-nodes #4778
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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", | ||
|
|
@@ -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" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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] | ||
|
|
||
| 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); | ||
| } | ||
| } |
There was a problem hiding this comment.
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.