Merge pull request #4410 from koooosh/1.33.x

Cherry-pick develop commits onto 1.33.x

CHANGELOG.md

@@ -1,18 +1,16 @@
-# v1.33.0 (2025-02-12)
+# v1.33.0 (2025-02-26)
 
 ## Release Highlights
 * Remove aws-k8s-1.24 variants ([#4359])
-* Add support for NVIDIA Multi-Instance GPU (MIG) ([#4252])
 
 ## OS Changes
-* Add support for NVIDIA Multi-Instance GPU (MIG) ([#4306])
 * Allow default host containers to be changed without a migration ([#4324])
 * Add default managed Bootstrap container ([#4349])
 * Correct migrations for public control containers. ([#4388])
 
 ## Build Changes
-* Update bottlerocket-kernel-kit to 1.1.1 ([#4383], [#4386], [#4394])
-* Update bottlerocket-core-kit to 6.0.0 ([#4387])
+* Update bottlerocket-kernel-kit to 1.1.2 ([#4383], [#4386], [#4394], [#4408])
+* Update bottlerocket-core-kit to 6.0.1 ([#4387], [#4403])
 
 ### Twoliter
 * Update Twoliter to 0.7.2 ([#4384])
@@ -21,8 +19,6 @@
 ### Kubernetes
 * Deprecate Kubernetes 1.24 AWS variants ([#4379])
 
-[#4252]: https://github.com/bottlerocket-os/bottlerocket/issues/4252
-[#4306]: https://github.com/bottlerocket-os/bottlerocket/pull/4306
 [#4324]: https://github.com/bottlerocket-os/bottlerocket/pull/4324
 [#4349]: https://github.com/bottlerocket-os/bottlerocket/pull/4349
 [#4359]: https://github.com/bottlerocket-os/bottlerocket/issues/4359
@@ -33,6 +29,8 @@
 [#4387]: https://github.com/bottlerocket-os/bottlerocket/pull/4387
 [#4388]: https://github.com/bottlerocket-os/bottlerocket/pull/4388
 [#4394]: https://github.com/bottlerocket-os/bottlerocket/pull/4394
+[#4403]: https://github.com/bottlerocket-os/bottlerocket/pull/4403
+[#4408]: https://github.com/bottlerocket-os/bottlerocket/pull/4408
 
 # v1.32.0 (2025-01-24)
 

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",

Twoliter.lock

@@ -9,14 +9,14 @@ digest = "HEh3Lx3F6P4OEPnFubF++RMpMW2vlfp/Tc/tGjnBRcM="
 
 [[kit]]
 name = "bottlerocket-kernel-kit"
-version = "1.1.1"
+version = "1.1.2"
 vendor = "bottlerocket"
-source = "public.ecr.aws/bottlerocket/bottlerocket-kernel-kit:v1.1.1"
-digest = "47l4jAJ8NL3dIcHw7Dj10y2Ko+0JowYejNed1Zfas4k="
+source = "public.ecr.aws/bottlerocket/bottlerocket-kernel-kit:v1.1.2"
+digest = "H0fbTGkbYi+jXUUXhDh5pv7i2umKgnv/vaZ/SN27xN0="
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "6.0.0"
+version = "6.0.1"
 vendor = "bottlerocket"
-source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v6.0.0"
-digest = "B9i0/BFgLBcwspou8owslnxdLNo+NW0MlhMtdjDQ6Sw="
+source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v6.0.1"
+digest = "SboBRtwOweOq3YUK3omqTYFDFpz0in6AoBVALu+qJa8="

Twoliter.toml

@@ -11,10 +11,10 @@ vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-kernel-kit"
-version = "1.1.1"
+version = "1.1.2"
 vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "6.0.0"
+version = "6.0.1"
 vendor = "bottlerocket"

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]

sources/shared-defaults/kubernetes-aws-credential-provider.toml

@@ -5,6 +5,8 @@ image-patterns = [
     "*.dkr.ecr.*.amazonaws.com",
     "*.dkr.ecr.*.amazonaws.com.cn",
     "*.dkr.ecr-fips.*.amazonaws.com",
+    "*.dkr.ecr.eu-isoe-west-1.cloud.adc-e.uk",
+    "*.dkr.ecr-fips.eu-isoe-west-1.cloud.adc-e.uk",
     "*.dkr.ecr.us-iso-east-1.c2s.ic.gov",
     "*.dkr.ecr.us-isob-east-1.sc2s.sgov.gov"
 ]

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"