Merge pull request #4405 from koooosh/revert-mig

Revert MIG changes
bottlerocket-os · Feb 19, 2025 · cb6c280 · cb6c280
2 parents d5d621f + b3e4fb2
commit cb6c280
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 93 deletions.
diff --git 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
diff --git 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
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