colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NixOS] Reenable serviec that enabled cdi for k3s containerd

Browse Source 
enabel
This commit is contained in:
Ivan Malison
2024-12-30 01:25:53 -07:00
parent 794f3c1eb8
commit 697d216397
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
nixos/k3s.nix
View File

@@ -48,16 +48,16 @@ in {
enableGarbageCollect = true; enableGarbageCollect = true;
}; };
virtualisation.containerd = { # virtualisation.containerd = {
enable = false; # enable = false;
settings = { # settings = {
plugins."io.containerd.grpc.v1.cri" = { # plugins."io.containerd.grpc.v1.cri" = {
enable_cdi = true; # enable_cdi = true;
cdi_spec_dirs = [ "/var/run/cdi" ]; # cdi_spec_dirs = [ "/var/run/cdi" ];
cni.bin_dir = "${plugins-path}/bin"; # cni.bin_dir = "${plugins-path}/bin";
}; # };
}; # };
}; # };
virtualisation.containers = { virtualisation.containers = {
containersConf.cniPlugins = [ containersConf.cniPlugins = [
@@ -74,20 +74,20 @@ 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 = { k3s-containerd-setup = {
# # `virtualisation.containerd.settings` has no effect on k3s' bundled containerd. # `virtualisation.containerd.settings` has no effect on k3s' bundled containerd.
# serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
# requiredBy = ["k3s.service"]; requiredBy = ["k3s.service"];
# before = ["k3s.service"]; before = ["k3s.service"];
# script = '' script = ''
# cat << EOF > /var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl cat << EOF > /var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl
# {{ template "base" . }} {{ template "base" . }}
# [plugins] [plugins]
# "io.containerd.grpc.v1.cri".enable_cdi = true "io.containerd.grpc.v1.cri".enable_cdi = true
# EOF EOF
# ''; '';
# }; };
}; };
systemd.services.mount-railbird-bucket = { systemd.services.mount-railbird-bucket = {