Nvidia Settings API changes

bottlerocket-os · Aug 14, 2024 · 6c7ab5f · 6c7ab5f
1 parent 4d43022
commit 6c7ab5f
Show file tree

Hide file tree

Showing 29 changed files with 409 additions and 48 deletions.
diff --git a/Release.toml b/Release.toml
@@ -330,3 +330,9 @@ version = "1.21.0"
     "migrate_v1.21.0_k8s-reserved-cpus-v0-1-0.lz4",
     "migrate_v1.21.0_add-hostname-override-source.lz4",
 ]
+"(1.21.0, 1.21.1)" = [
+    "migrate_v1.21.1_nvidia-container-runtime-metadata.lz4",
+    "migrate_v1.21.1_nvidia-container-runtime-settings.lz4",
+    "migrate_v1.21.1_nvidia-k8s-device-plugin-metadata.lz4",
+    "migrate_v1.21.1_nvidia-k8s-device-plugin-settings.lz4",
+]
diff --git a/Twoliter.lock b/Twoliter.lock
@@ -1,6 +1,6 @@
 schema-version = 1
 release-version = "1.21.0"
-digest = "xrDJu9xcRcdcb2lrWOH9P9gXHfe83eO68IRJRFxlZsg="
+digest = "P0+AdoaerJKmHjYjOACC1MGgioZENfHR3DGPlgTVfZw="
 
 [sdk]
 name = "bottlerocket-sdk"
@@ -12,6 +12,6 @@ digest = "1zKyWC/pXdpzKfNj1Xp1YvEWdyltI7EhAeiNwlikBz8="
 [[kit]]
 name = "bottlerocket-core-kit"
 version = "2.3.1"
-vendor = "bottlerocket"
-source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v2.3.1"
-digest = "JEn010SJp41iPAl9xFRWQC57QTyhk7xo+SgpFxPSPLo="
+vendor = "monirul"
+source = "397850904080.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-core-kit:v2.3.1"
+digest = "bV/g2lJY01h0NdmpW0RwA+BhkDkL898gfR2bL+FY75k="
diff --git a/Twoliter.toml b/Twoliter.toml
@@ -4,12 +4,18 @@ release-version = "1.21.0"
 [vendor.bottlerocket]
 registry = "public.ecr.aws/bottlerocket"
 
+# ======= REVERT BEFORE FINAL PR =================
+[vendor.monirul]
+registry = "397850904080.dkr.ecr.us-west-2.amazonaws.com"
+
 [sdk]
 name = "bottlerocket-sdk"
 version = "0.43.0"
 vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-core-kit"
+# ======= REVERT BEFORE FINAL PR =================
 version = "2.3.1"
-vendor = "bottlerocket"
+vendor = "monirul"
+
diff --git a/packages/settings-plugins/settings-plugins.spec b/packages/settings-plugins/settings-plugins.spec
@@ -57,26 +57,38 @@ Summary: Settings plugin for the aws-k8s variants
 Requires: %{_cross_os}variant-family(aws-k8s)
 Provides: %{_cross_os}settings-plugin(any)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.23)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.23-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.24)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.24-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.25)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.25-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.26)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.26-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.27)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.27-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.28)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.28-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.29)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.29-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.30)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-nvidia)
 Conflicts: %{_cross_os}settings-plugin(any)
+Conflicts: %{_cross_os}variant-flavor(nvidia)
+
 
 %description aws-k8s
 %{summary}.
 
+%package aws-k8s-nvidia
+Summary: Settings plugin for the aws-k8s-nvidia variants
+Requires: (%{_cross_os}variant-family(aws-k8s) and %{_cross_os}variant-flavor(nvidia))
+Provides: %{_cross_os}settings-plugin(any)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.23-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.24-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.25-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.26-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.27-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.28-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.29-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-nvidia)
+Conflicts: %{_cross_os}settings-plugin(any)
+
+%description aws-k8s-nvidia
+%{summary}.
+
+
 %package metal-dev
 Summary: Settings plugin for the metal-dev variant
 Requires: %{_cross_os}variant(metal-dev)
@@ -132,13 +144,25 @@ Conflicts: %{_cross_os}settings-plugin(any)
   -p settings-plugin-aws-dev \
   -p settings-plugin-aws-ecs-1 \
   -p settings-plugin-aws-ecs-2 \
-  -p settings-plugin-aws-k8s \
   -p settings-plugin-metal-dev \
   -p settings-plugin-metal-k8s \
   -p settings-plugin-vmware-dev \
   -p settings-plugin-vmware-k8s \
   %{nil}
 
+# The settings-plugin-aws-k8s and settings-plugin-aws-k8s-nvidia are compiled independently
+# due to the requirement of distinct feature flags. This separation is necessary to prevent
+# feature unification, as detailed in the Rust Cargo documentation:
+# https://doc.rust-lang.org/cargo/reference/features.html#feature-unification
+%cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \
+  -p settings-plugin-aws-k8s \
+  %{nil}
+
+%cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \
+  -p settings-plugin-aws-k8s-nvidia \
+  %{nil}
+
+
 %install
 install -d %{buildroot}%{_cross_pluginsdir}
 install -d %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d
@@ -148,6 +172,7 @@ for plugin in \
   aws-dev \
   aws-ecs-1 \
   aws-ecs-2 \
+  aws-k8s-nvidia \
   aws-k8s \
   metal-dev \
   metal-k8s \
@@ -191,6 +216,11 @@ done
 %{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/aws-k8s.conf
 %{_cross_tmpfilesdir}/settings-plugin-aws-k8s.conf
 
+%files aws-k8s-nvidia
+%{_cross_pluginsdir}/aws-k8s-nvidia/libsettings.so
+%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/aws-k8s-nvidia.conf
+%{_cross_tmpfilesdir}/settings-plugin-aws-k8s-nvidia.conf
+
 %files metal-dev
 %{_cross_pluginsdir}/metal-dev/libsettings.so
 %{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/metal-dev.conf