fix: unable to override runtime defaults

This fixes the issue when `.machine.files` using `/etc/cri/conf.d/20-customization.part` is sometimes unable to merge the values. The fix is to prefix the the files with `10-` prefix so the customization with `20-` takes precedence when merging. `gvisor-debug` is prefixed with `11-` since it should overwrite the gvisor defaults. This also fixes where the order of gvisor extensions mattered previously. Fixes: #578 Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Jan 10, 2025 · 9c92bda · 9c92bda
1 parent db466d1
commit 9c92bda
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 8 deletions.
diff --git a/container-runtime/crun/crun.part → container-runtime/crun/10-crun.part b/container-runtime/crun/crun.part → container-runtime/crun/10-crun.part
diff --git a/container-runtime/crun/pkg.yaml b/container-runtime/crun/pkg.yaml
@@ -27,7 +27,7 @@ steps:
 
       - |
         mkdir -p /rootfs/etc/cri/conf.d
-        cp /pkg/crun.part /rootfs/etc/cri/conf.d/crun.part
+        cp /pkg/10-crun.part /rootfs/etc/cri/conf.d/10-crun.part
     test:
       - |
         mkdir -p /extensions-validator-rootfs

diff --git a/...er-runtime/gvisor-debug/gvisor-debug.part → ...runtime/gvisor-debug/11-gvisor-debug.part b/...er-runtime/gvisor-debug/gvisor-debug.part → ...runtime/gvisor-debug/11-gvisor-debug.part
diff --git a/container-runtime/gvisor-debug/pkg.yaml b/container-runtime/gvisor-debug/pkg.yaml
@@ -10,7 +10,7 @@ steps:
     install:
       - |
         mkdir -p /rootfs/etc/cri/conf.d
-        cp /pkg/gvisor-debug.part /rootfs/etc/cri/conf.d/gvisor-debug.part
+        cp /pkg/11-gvisor-debug.part /rootfs/etc/cri/conf.d/11-gvisor-debug.part
         cp /pkg/runsc.toml /rootfs/etc/cri/conf.d/runsc.toml
     test:
       - |

diff --git a/container-runtime/gvisor/gvisor-kvm.part → container-runtime/gvisor/10-gvisor-kvm.part b/container-runtime/gvisor/gvisor-kvm.part → container-runtime/gvisor/10-gvisor-kvm.part
diff --git a/container-runtime/gvisor/gvisor.part → container-runtime/gvisor/10-gvisor.part b/container-runtime/gvisor/gvisor.part → container-runtime/gvisor/10-gvisor.part
diff --git a/container-runtime/gvisor/pkg.yaml b/container-runtime/gvisor/pkg.yaml
@@ -48,7 +48,7 @@ steps:
       - |
         mkdir -p /rootfs/etc/cri/conf.d
 
-        cp /pkg/gvisor.part /pkg/runsc.toml /pkg/gvisor-kvm.part /pkg/runsc-kvm.toml /rootfs/etc/cri/conf.d/
+        cp /pkg/10-gvisor.part /pkg/runsc.toml /pkg/10-gvisor-kvm.part /pkg/runsc-kvm.toml /rootfs/etc/cri/conf.d/
     test:
       - |
         mkdir -p /extensions-validator-rootfs

diff --git a/...time/kata-containers/kata-containers.part → ...e/kata-containers/10-kata-containers.part b/...time/kata-containers/kata-containers.part → ...e/kata-containers/10-kata-containers.part
diff --git a/container-runtime/kata-containers/pkg.yaml b/container-runtime/kata-containers/pkg.yaml
@@ -61,7 +61,7 @@ steps:
         cp containerd-shim-kata-v2 /rootfs/usr/local/bin/containerd-shim-kata-v2
       - |
         mkdir -p /rootfs/etc/cri/conf.d
-        cp /pkg/kata-containers.part /rootfs/etc/cri/conf.d/kata-containers.part
+        cp /pkg/10-kata-containers.part /rootfs/etc/cri/conf.d/10-kata-containers.part
 
         mkdir -p /rootfs/usr/local/share/kata-containers
         cp /pkg/configuration.toml /rootfs/usr/local/share/kata-containers/configuration.toml

diff --git a/container-runtime/spin/spin.part → container-runtime/spin/10-spin.part b/container-runtime/spin/spin.part → container-runtime/spin/10-spin.part
diff --git a/container-runtime/spin/pkg.yaml b/container-runtime/spin/pkg.yaml
@@ -26,7 +26,7 @@ steps:
         tar xf containerd-shim-spin.tar.gz -C /rootfs/usr/local/bin
       - |
         mkdir -p /rootfs/etc/cri/conf.d
-        cp /pkg/spin.part /rootfs/etc/cri/conf.d/spin.part
+        cp /pkg/10-spin.part /rootfs/etc/cri/conf.d/10-spin.part
     test:
       - |
         mkdir -p /extensions-validator-rootfs

diff --git a/...targz-snapshotter/stargz-snapshotter.part → ...gz-snapshotter/10-stargz-snapshotter.part b/...targz-snapshotter/stargz-snapshotter.part → ...gz-snapshotter/10-stargz-snapshotter.part
diff --git a/container-runtime/stargz-snapshotter/pkg.yaml b/container-runtime/stargz-snapshotter/pkg.yaml
@@ -43,7 +43,7 @@ steps:
         chmod +x /rootfs/usr/local/lib/containers/stargz-snapshotter/ctr-remote
       - |
         mkdir -p /rootfs/etc/cri/conf.d
-        cp /pkg/stargz-snapshotter.part /rootfs/etc/cri/conf.d/stargz-snapshotter.part
+        cp /pkg/10-stargz-snapshotter.part /rootfs/etc/cri/conf.d/10-stargz-snapshotter.part
 
         mkdir -p /rootfs/usr/local/etc/containerd-stargz-grpc
         cp /pkg/config.toml /rootfs/usr/local/etc/containerd-stargz-grpc/config.toml

diff --git a/container-runtime/wasmedge/wasm.part → container-runtime/wasmedge/10-wasm.part b/container-runtime/wasmedge/wasm.part → container-runtime/wasmedge/10-wasm.part
diff --git a/container-runtime/wasmedge/pkg.yaml b/container-runtime/wasmedge/pkg.yaml
@@ -24,7 +24,7 @@ steps:
         mkdir -p /rootfs/usr/local/bin
         mkdir -p /rootfs/etc/cri/conf.d
 
-        cp /pkg/wasm.part /rootfs/etc/cri/conf.d/wasm.part
+        cp /pkg/10-wasm.part /rootfs/etc/cri/conf.d/10-wasm.part
 
         tar xf containerd-shim-wasmedge.tar.gz -C /rootfs/usr/local/bin
     test:

diff --git a/...ner-runtime/nvidia-container-runtime.part → ...-runtime/10-nvidia-container-runtime.part b/...ner-runtime/nvidia-container-runtime.part → ...-runtime/10-nvidia-container-runtime.part
diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime/pkg.yaml
@@ -51,7 +51,7 @@ steps:
         done
       - |
         mkdir -p /rootfs/etc/cri/conf.d
-        cp /pkg/nvidia-container-runtime.part /rootfs/etc/cri/conf.d/nvidia-container-runtime.part
+        cp /pkg/10-nvidia-container-runtime.part /rootfs/etc/cri/conf.d/10-nvidia-container-runtime.part
 
         mkdir -p /rootfs/usr/local/etc/nvidia-container-runtime
         cp /pkg/nvidia-container-runtime.toml /rootfs/usr/local/etc/nvidia-container-runtime/config.toml