diff --git a/Release.toml b/Release.toml index 77d9e36d48c..31e2c028bde 100644 --- a/Release.toml +++ b/Release.toml @@ -396,7 +396,6 @@ version = "1.33.0" ] "(1.31.0, 1.32.0)" = [] "(1.32.0, 1.33.0)" = [ - "migrate_v1.33.0_kubelet-device-plugins-mig-settings.lz4", "migrate_v1.33.0_public-control-container-v0-7-19-update.lz4", "migrate_v1.33.0_public-control-container-v0-7-20-update.lz4", "migrate_v1.33.0_aws-remove-schnauzer-admin.lz4", diff --git a/sources/Cargo.lock b/sources/Cargo.lock index a4d8ee64d0c..636d94a6428 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -548,7 +548,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "darling 0.20.8", "quote", @@ -557,8 +557,8 @@ dependencies = [ [[package]] name = "bottlerocket-modeled-types" -version = "0.8.0" -source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +version = "0.7.0" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "base64 0.22.1", "bottlerocket-model-derive", @@ -593,7 +593,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "serde", "serde_plain", @@ -602,7 +602,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-scalar", "darling 0.20.8", @@ -616,7 +616,7 @@ dependencies = [ [[package]] name = "bottlerocket-settings-derive" version = "0.1.0" -source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-plugin-v0.1.0#9cb0286b59cd4fcb5df9dd441aee8521ea5698e6" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "darling 0.20.8", "proc-macro2", @@ -626,8 +626,8 @@ dependencies = [ [[package]] name = "bottlerocket-settings-models" -version = "0.8.0" -source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +version = "0.7.0" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -665,7 +665,7 @@ dependencies = [ [[package]] name = "bottlerocket-settings-plugin" version = "0.1.0" -source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-plugin-v0.1.0#9cb0286b59cd4fcb5df9dd441aee8521ea5698e6" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "abi_stable", "bottlerocket-settings-derive", @@ -677,7 +677,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "argh", "bottlerocket-template-helper", @@ -690,7 +690,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "serde", ] @@ -698,7 +698,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "darling 0.20.8", "proc-macro2", @@ -1634,13 +1634,6 @@ dependencies = [ "migration-helpers", ] -[[package]] -name = "kubelet-device-plugins-mig-settings" -version = "0.1.0" -dependencies = [ - "migration-helpers", -] - [[package]] name = "kubelet-device-plugins-settings" version = "0.1.0" @@ -2838,7 +2831,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2851,7 +2844,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2864,7 +2857,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2878,7 +2871,7 @@ dependencies = [ [[package]] name = "settings-extension-bootstrap-containers" version = "0.1.0" -source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2891,7 +2884,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2904,7 +2897,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2917,7 +2910,7 @@ dependencies = [ [[package]] name = "settings-extension-container-runtime" version = "0.1.0" -source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2930,7 +2923,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2943,7 +2936,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2956,7 +2949,7 @@ dependencies = [ [[package]] name = "settings-extension-host-containers" version = "0.1.0" -source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2969,7 +2962,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2981,8 +2974,8 @@ dependencies = [ [[package]] name = "settings-extension-kubelet-device-plugins" -version = "0.2.0" -source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +version = "0.1.0" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2995,7 +2988,7 @@ dependencies = [ [[package]] name = "settings-extension-kubernetes" version = "0.2.0" -source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3009,7 +3002,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3022,7 +3015,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-settings-sdk", "bottlerocket-string-impls-for", @@ -3034,7 +3027,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3047,7 +3040,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3060,7 +3053,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3073,7 +3066,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3087,7 +3080,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3100,7 +3093,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3113,7 +3106,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.8.0#c9e5f989c24bea2006527c6f1a4708225ab70cc4" +source = "git+/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", diff --git a/sources/Cargo.toml b/sources/Cargo.toml index d0244df82be..18dd8227fe2 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -81,7 +81,6 @@ members = [ "settings-migrations/v1.31.0/public-admin-container-v0-11-16", "settings-migrations/v1.31.0/aws-control-container-v0-7-20", "settings-migrations/v1.31.0/public-control-container-v0-7-20", - "settings-migrations/v1.33.0/kubelet-device-plugins-mig-settings", "settings-migrations/v1.33.0/public-control-container-v0-7-19-update", "settings-migrations/v1.33.0/public-control-container-v0-7-20-update", "settings-migrations/v1.33.0/aws-remove-schnauzer-admin", @@ -165,22 +164,22 @@ version = "0.1.0" [workspace.dependencies.bottlerocket-modeled-types] git = "/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-models-v0.8.0" -version = "0.8.0" +tag = "bottlerocket-settings-models-v0.7.0" +version = "0.7.0" [workspace.dependencies.bottlerocket-settings-models] git = "/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-models-v0.8.0" -version = "0.8.0" +tag = "bottlerocket-settings-models-v0.7.0" +version = "0.7.0" [workspace.dependencies.bottlerocket-settings-plugin] git = "/~https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-plugin-v0.1.0" +tag = "bottlerocket-settings-models-v0.7.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.8.0" +tag = "bottlerocket-settings-models-v0.7.0" version = "0.1.0" [profile.release] diff --git a/sources/settings-migrations/v1.33.0/kubelet-device-plugins-mig-settings/Cargo.toml b/sources/settings-migrations/v1.33.0/kubelet-device-plugins-mig-settings/Cargo.toml deleted file mode 100644 index a6e7538cc7e..00000000000 --- a/sources/settings-migrations/v1.33.0/kubelet-device-plugins-mig-settings/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "kubelet-device-plugins-mig-settings" -version = "0.1.0" -authors = ["Piyush Jena "] -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 diff --git a/sources/settings-migrations/v1.33.0/kubelet-device-plugins-mig-settings/src/main.rs b/sources/settings-migrations/v1.33.0/kubelet-device-plugins-mig-settings/src/main.rs deleted file mode 100644 index 70cb704b289..00000000000 --- a/sources/settings-migrations/v1.33.0/kubelet-device-plugins-mig-settings/src/main.rs +++ /dev/null @@ -1,22 +0,0 @@ -use migration_helpers::common_migrations::AddPrefixesMigration; -use migration_helpers::{migrate, Result}; -use std::process; - -/// We added new settings for configuring the NVIDIA k8s device plugin. -fn run() -> Result<()> { - migrate(AddPrefixesMigration(vec![ - "settings.kubelet-device-plugins.nvidia.device-partitioning-strategy", - "settings.kubelet-device-plugins.nvidia.mig", - "configuration-files.nvidia-k8s-device-plugin-mig-conf", - ])) -} - -// 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); - } -} diff --git a/sources/shared-defaults/nvidia-k8s-device-plugin.toml b/sources/shared-defaults/nvidia-k8s-device-plugin.toml index 728fe6b3341..7828ebdfd74 100644 --- a/sources/shared-defaults/nvidia-k8s-device-plugin.toml +++ b/sources/shared-defaults/nvidia-k8s-device-plugin.toml @@ -4,7 +4,6 @@ restart-commands = ["/bin/systemctl try-reload-or-restart nvidia-k8s-device-plug configuration-files = [ "nvidia-k8s-device-plugin-conf", "nvidia-k8s-device-plugin-exec-start-conf", - "nvidia-k8s-device-plugin-mig-conf" ] [configuration-files.nvidia-k8s-device-plugin-conf] @@ -15,10 +14,6 @@ template-path = "/usr/share/templates/nvidia-k8s-device-plugin-conf" path = "/etc/systemd/system/nvidia-k8s-device-plugin.service.d/exec-start.conf" template-path = "/usr/share/templates/nvidia-k8s-device-plugin-exec-start-conf" -[configuration-files.nvidia-k8s-device-plugin-mig-conf] -path = "/etc/nvidia-migmanager/nvidia-migmanager.toml" -template-path = "/usr/share/templates/nvidia-k8s-device-plugin-mig-conf" - [metadata.settings.kubelet-device-plugins.nvidia] affected-services = ["nvidia-k8s-device-plugin"] @@ -27,4 +22,3 @@ pass-device-specs = true device-id-strategy="index" device-list-strategy="volume-mounts" device-sharing-strategy="none" -device-partitioning-strategy="none"