mirror of
https://github.com/siderolabs/extensions.git
synced 2025-08-06 06:17:11 +02:00
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 <git@frezbo.dev>
This commit is contained in:
parent
db466d1025
commit
9c92bda95b
@ -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
|
||||
|
@ -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:
|
||||
- |
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user