[NixOS] Put k3s-containerd config in the right place

This commit is contained in:
2024-12-30 15:36:29 -07:00
parent 953d57be15
commit 29ab9150f8

View File

@@ -78,32 +78,6 @@ in {
# unless I bodge their path into the environment. # unless I bodge their path into the environment.
environment.LD_LIBRARY_PATH = "${config.hardware.nvidia.package}/lib"; environment.LD_LIBRARY_PATH = "${config.hardware.nvidia.package}/lib";
}; };
k3s-containerd-setup = {
# `virtualisation.containerd.settings` has no effect on k3s' bundled containerd.
serviceConfig.Type = "oneshot";
requiredBy = ["k3s.service"];
before = ["k3s.service"];
script = ''
cat << EOF > /var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl
{{ template "base" . }}
[debug]
level = "trace"
[plugins.'io.containerd.runc']
enable_cdi = true
cdi_spec_dirs = ['/var/run/cdi']
[plugins.'io.containerd.grpc.v1.cri']
enable_cdi = true
cdi_spec_dirs = ['/var/run/cdi']
[plugins.'io.containerd.cri.v1.runtime']
enable_cdi = true
cdi_spec_dirs = ['/var/run/cdi']
EOF
'';
};
}; };
systemd.services.mount-railbird-bucket = { systemd.services.mount-railbird-bucket = {
@@ -168,9 +142,20 @@ in {
containerdConfigTemplate = '' containerdConfigTemplate = ''
{{ template "base" . }} {{ template "base" . }}
[plugins] [debug]
"io.containerd.grpc.v1.cri".enable_cdi = true level = "trace"
"io.containerd.grpc.v1.cri".cdi_spec_dirs = [ "/var/run/cdi" ]
[plugins.'io.containerd.runc']
enable_cdi = true
cdi_spec_dirs = ['/var/run/cdi']
[plugins.'io.containerd.grpc.v1.cri']
enable_cdi = true
cdi_spec_dirs = ['/var/run/cdi']
[plugins.'io.containerd.cri.v1.runtime']
enable_cdi = true
cdi_spec_dirs = ['/var/run/cdi']
''; '';
gracefulNodeShutdown = { gracefulNodeShutdown = {
enable = true; enable = true;