diff --git a/Release.toml b/Release.toml index a49a012715e..46f2030bdd0 100644 --- a/Release.toml +++ b/Release.toml @@ -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"] @@ -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" +] diff --git a/Twoliter.lock b/Twoliter.lock index 726242bf89c..eaed6a0be97 100644 --- a/Twoliter.lock +++ b/Twoliter.lock @@ -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" +source = "public.ecr.aws/s2v1a1q8/bottlerocket-core-kit:v13.1.1" +digest = "5+f5HLmQkjORQmhuL4aCZEyZ2VwjuaImxRkQa/Ylr/0=" diff --git a/Twoliter.toml b/Twoliter.toml index 06376ee3d72..d0e3bc18dbf 100644 --- a/Twoliter.toml +++ b/Twoliter.toml @@ -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" @@ -17,5 +20,5 @@ vendor = "bottlerocket" [[kit]] name = "bottlerocket-core-kit" -version = "13.1.0" -vendor = "bottlerocket" +version = "13.1.1" +vendor = "piyush" diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 0e3433f3f6e..d0c6fff3123 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -303,7 +303,7 @@ dependencies = [ [[package]] name = "bottlerocket-defaults-helper" version = "0.1.1" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "snafu", "toml", @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "bottlerocket-model-derive" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "darling", "quote", @@ -322,8 +322,8 @@ dependencies = [ [[package]] name = "bottlerocket-modeled-types" -version = "0.14.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +version = "0.15.0" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "base64", "bottlerocket-model-derive", @@ -359,7 +359,7 @@ dependencies = [ [[package]] name = "bottlerocket-scalar" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "serde", "serde_plain", @@ -368,7 +368,7 @@ dependencies = [ [[package]] name = "bottlerocket-scalar-derive" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-scalar", "darling", @@ -382,7 +382,7 @@ dependencies = [ [[package]] name = "bottlerocket-settings-derive" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "darling", "proc-macro2", @@ -392,8 +392,8 @@ dependencies = [ [[package]] name = "bottlerocket-settings-models" -version = "0.21.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +version = "0.22.0" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "bottlerocket-settings-plugin" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "abi_stable", "bottlerocket-settings-derive", @@ -445,7 +445,7 @@ dependencies = [ [[package]] name = "bottlerocket-settings-sdk" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "argh", "bottlerocket-template-helper", @@ -458,7 +458,7 @@ dependencies = [ [[package]] name = "bottlerocket-string-impls-for" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "serde", ] @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "bottlerocket-template-helper" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "darling", "proc-macro2", @@ -1223,6 +1223,13 @@ dependencies = [ "snafu", ] +[[package]] +name = "kubernetes-topology-manager-policy-options" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -2024,7 +2031,7 @@ dependencies = [ [[package]] name = "settings-extension-autoscaling" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2037,7 +2044,7 @@ dependencies = [ [[package]] name = "settings-extension-aws" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2050,7 +2057,7 @@ dependencies = [ [[package]] name = "settings-extension-bootstrap-commands" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2064,7 +2071,7 @@ dependencies = [ [[package]] name = "settings-extension-bootstrap-containers" version = "0.2.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2077,7 +2084,7 @@ dependencies = [ [[package]] name = "settings-extension-cloudformation" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2090,7 +2097,7 @@ dependencies = [ [[package]] name = "settings-extension-container-registry" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2103,7 +2110,7 @@ dependencies = [ [[package]] name = "settings-extension-container-runtime" version = "0.4.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2116,7 +2123,7 @@ dependencies = [ [[package]] name = "settings-extension-container-runtime-plugins" version = "0.2.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2132,7 +2139,7 @@ dependencies = [ [[package]] name = "settings-extension-dns" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2145,7 +2152,7 @@ dependencies = [ [[package]] name = "settings-extension-ecs" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2158,7 +2165,7 @@ dependencies = [ [[package]] name = "settings-extension-host-containers" version = "0.2.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2171,7 +2178,7 @@ dependencies = [ [[package]] name = "settings-extension-image-verifier-plugins" version = "0.2.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2184,7 +2191,7 @@ dependencies = [ [[package]] name = "settings-extension-kernel" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2197,7 +2204,7 @@ dependencies = [ [[package]] name = "settings-extension-kubelet-device-plugins" version = "0.3.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2209,8 +2216,8 @@ dependencies = [ [[package]] name = "settings-extension-kubernetes" -version = "0.9.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +version = "0.10.0" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2224,7 +2231,7 @@ dependencies = [ [[package]] name = "settings-extension-metrics" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2237,7 +2244,7 @@ dependencies = [ [[package]] name = "settings-extension-motd" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-settings-sdk", "bottlerocket-string-impls-for", @@ -2250,7 +2257,7 @@ dependencies = [ [[package]] name = "settings-extension-network" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2263,7 +2270,7 @@ dependencies = [ [[package]] name = "settings-extension-ntp" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2276,7 +2283,7 @@ dependencies = [ [[package]] name = "settings-extension-nvidia-container-runtime" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2289,7 +2296,7 @@ dependencies = [ [[package]] name = "settings-extension-oci-defaults" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2303,7 +2310,7 @@ dependencies = [ [[package]] name = "settings-extension-oci-hooks" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2316,7 +2323,7 @@ dependencies = [ [[package]] name = "settings-extension-pki" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2329,7 +2336,7 @@ dependencies = [ [[package]] name = "settings-extension-updates" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.21.0#ed66ba6ae6e38bc86a1a45f7574a7a3df6f07d96" +source = "git+https://github.com/piyush-jena/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.22.0#169e39f647511eceadfbd21c74cc8f1e7c9975fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", diff --git a/sources/Cargo.toml b/sources/Cargo.toml index b2884f4d2bc..541707c46ce 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -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" +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] diff --git a/sources/deny.toml b/sources/deny.toml index c7b2f42bfd0..1b9cb66f350 100644 --- a/sources/deny.toml +++ b/sources/deny.toml @@ -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", ] diff --git a/sources/settings-migrations/v1.57.0/kubernetes-topology-manager-policy-options/Cargo.toml b/sources/settings-migrations/v1.57.0/kubernetes-topology-manager-policy-options/Cargo.toml new file mode 100644 index 00000000000..b6929265b4a --- /dev/null +++ b/sources/settings-migrations/v1.57.0/kubernetes-topology-manager-policy-options/Cargo.toml @@ -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 diff --git a/sources/settings-migrations/v1.57.0/kubernetes-topology-manager-policy-options/src/main.rs b/sources/settings-migrations/v1.57.0/kubernetes-topology-manager-policy-options/src/main.rs new file mode 100644 index 00000000000..92f1e1aa044 --- /dev/null +++ b/sources/settings-migrations/v1.57.0/kubernetes-topology-manager-policy-options/src/main.rs @@ -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); + } +}