diff --git a/Release.toml b/Release.toml index 8e63eb79a9f..eac1d673f4b 100644 --- a/Release.toml +++ b/Release.toml @@ -379,4 +379,6 @@ version = "1.29.0" "migrate_v1.28.0_aws-control-container-v0-7-18.lz4", "migrate_v1.28.0_public-control-container-v0-7-18.lz4", ] -"(1.28.0, 1.29.0)" = [] +"(1.28.0, 1.29.0)" = [ + "migrate_v1.29.0_kubernete-device-ownership.lz4" +] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 826b31e5429..511a69156ca 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "abi_stable" @@ -496,7 +496,7 @@ dependencies = [ [[package]] name = "bottlerocket-defaults-helper" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-defaults-helper-v0.1.0#9cb0286b59cd4fcb5df9dd441aee8521ea5698e6" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "snafu", "toml", @@ -506,7 +506,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "darling 0.20.8", "quote", @@ -516,7 +516,7 @@ dependencies = [ [[package]] name = "bottlerocket-modeled-types" version = "0.6.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "base64 0.22.1", "bottlerocket-model-derive", @@ -551,7 +551,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "serde", "serde_plain", @@ -560,7 +560,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-scalar", "darling 0.20.8", @@ -574,7 +574,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/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "darling 0.20.8", "proc-macro2", @@ -585,7 +585,7 @@ dependencies = [ [[package]] name = "bottlerocket-settings-models" version = "0.6.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -623,7 +623,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/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "abi_stable", "bottlerocket-settings-derive", @@ -635,7 +635,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "argh", "bottlerocket-template-helper", @@ -648,7 +648,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "serde", ] @@ -656,7 +656,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "darling 0.20.8", "proc-macro2", @@ -1605,6 +1605,20 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "kubernetes-device-ownership-metadata" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + +[[package]] +name = "kubernetes-device-ownership-settings" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "kubernetes-service-config" version = "0.1.0" @@ -2709,7 +2723,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2722,7 +2736,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2735,7 +2749,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2749,7 +2763,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2762,7 +2776,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2775,7 +2789,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2788,7 +2802,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2801,7 +2815,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2814,7 +2828,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2827,7 +2841,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2840,7 +2854,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2853,7 +2867,7 @@ dependencies = [ [[package]] name = "settings-extension-kubelet-device-plugins" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2866,7 +2880,7 @@ dependencies = [ [[package]] name = "settings-extension-kubernetes" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2880,7 +2894,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2893,7 +2907,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-settings-sdk", "bottlerocket-string-impls-for", @@ -2905,7 +2919,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2918,7 +2932,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2931,7 +2945,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2944,7 +2958,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2958,7 +2972,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2971,7 +2985,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2984,7 +2998,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.6.0#276b8e8f6db01c9a03469613e82ece11d729b908" +source = "git+https://github.com/vigh-m/bottlerocket-settings-sdk?tag=test-1#a82821fd350bbefa0d4a73c09795f6cce5a3be83" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", diff --git a/sources/Cargo.toml b/sources/Cargo.toml index d59c84dfe04..7a7483ca0c3 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -71,6 +71,8 @@ members = [ "settings-migrations/v1.28.0/public-admin-container-v0-11-14", "settings-migrations/v1.28.0/aws-control-container-v0-7-18", "settings-migrations/v1.28.0/public-control-container-v0-7-18", + "settings-migrations/v1.29.1/kubernetes-device-ownership-settings", + "settings-migrations/v1.29.1/kubernetes-device-ownership-metadata", "settings-plugins/aws-dev", "settings-plugins/aws-ecs-1", @@ -141,28 +143,28 @@ url = "2" walkdir = "2" [workspace.dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" +git = "https://github.com/vigh-m/bottlerocket-settings-sdk" +tag = "test-1" version = "0.1.0" [workspace.dependencies.bottlerocket-modeled-types] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-models-v0.6.0" +git = "https://github.com/vigh-m/bottlerocket-settings-sdk" +tag = "test-1" version = "0.6.0" [workspace.dependencies.bottlerocket-settings-models] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-models-v0.6.0" +git = "https://github.com/vigh-m/bottlerocket-settings-sdk" +tag = "test-1" version = "0.6.0" [workspace.dependencies.bottlerocket-settings-plugin] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-plugin-v0.1.0" +git = "https://github.com/vigh-m/bottlerocket-settings-sdk" +tag = "test-1" version = "0.1.0" [workspace.dependencies.settings-extension-oci-defaults] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-models-v0.6.0" +git = "https://github.com/vigh-m/bottlerocket-settings-sdk" +tag = "test-1" version = "0.1.0" [profile.release] diff --git a/sources/deny.toml b/sources/deny.toml index e9d22bf2ace..a9472dda934 100644 --- a/sources/deny.toml +++ b/sources/deny.toml @@ -91,5 +91,6 @@ allow-git = [ # The settings SDK is currently provided as a git dependency, # 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/bottlerocket-os/bottlerocket-settings-sdk", + "https://github.com/vigh-m/bottlerocket-settings-sdk", ] diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.25/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.25/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.25/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.26/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.26/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.26/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/metal-k8s-1.30/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/metal-k8s-1.30/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/metal-k8s-1.30/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/vmware-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml new file mode 120000 index 00000000000..fd989ade11e --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-migrations/v1.29.1/kubernetes-device-ownership-metadata/Cargo.toml b/sources/settings-migrations/v1.29.1/kubernetes-device-ownership-metadata/Cargo.toml new file mode 100644 index 00000000000..5014b7bcbd9 --- /dev/null +++ b/sources/settings-migrations/v1.29.1/kubernetes-device-ownership-metadata/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "kubernetes-device-ownership-metadata" +version = "0.1.0" +authors = ["Vighnesh Maheshwari "] +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.29.1/kubernetes-device-ownership-metadata/src/main.rs b/sources/settings-migrations/v1.29.1/kubernetes-device-ownership-metadata/src/main.rs new file mode 100644 index 00000000000..0ecf28924b4 --- /dev/null +++ b/sources/settings-migrations/v1.29.1/kubernetes-device-ownership-metadata/src/main.rs @@ -0,0 +1,21 @@ +use migration_helpers::common_migrations::AddSettingsMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +/// We added a new setting, `settings.kubernetes.device-ownership-from-security-context` to allow containers to gain +/// ownership of the requested device +fn run() -> Result<()> { + migrate(AddSettingsMigration(&[ + "settings.kubernetes.device-ownership-from-security-context" + ])) +} + +// 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/settings-migrations/v1.29.1/kubernetes-device-ownership-settings/Cargo.toml b/sources/settings-migrations/v1.29.1/kubernetes-device-ownership-settings/Cargo.toml new file mode 100644 index 00000000000..41f39a8755a --- /dev/null +++ b/sources/settings-migrations/v1.29.1/kubernetes-device-ownership-settings/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "kubernetes-device-ownership-settings" +version = "0.1.0" +authors = ["Vighnesh Maheshwari "] +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.29.1/kubernetes-device-ownership-settings/src/main.rs b/sources/settings-migrations/v1.29.1/kubernetes-device-ownership-settings/src/main.rs new file mode 100644 index 00000000000..b46bdcbefcd --- /dev/null +++ b/sources/settings-migrations/v1.29.1/kubernetes-device-ownership-settings/src/main.rs @@ -0,0 +1,22 @@ +use migration_helpers::common_migrations::{AddMetadataMigration, SettingMetadata}; +use migration_helpers::{migrate, Result}; +use std::process; + +/// We added a new setting, `settings.kubernetes.device-ownership-from-security-context` to allow containers to gain +/// ownership of the requested device +fn run() -> Result<()> { + migrate(AddMetadataMigration(&[SettingMetadata { + metadata: &["affected-services"], + setting: "settings.kubernetes.device-ownership-from-security-context", + }])) +} + +// 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/kubernetes-device-ownership-default-false.toml b/sources/shared-defaults/kubernetes-device-ownership-default-false.toml new file mode 100644 index 00000000000..38975701ab1 --- /dev/null +++ b/sources/shared-defaults/kubernetes-device-ownership-default-false.toml @@ -0,0 +1,5 @@ +[settings.kubernetes] +device-ownership-from-security-context = false + +[metadata.settings.kubernetes.device-ownership-from-security-context] +affected-services = ["containerd"]