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

[NixOS] Use /opt/cni/bin as dir for network plugins

Browse Source
This commit is contained in:
Ivan Malison
2024-12-29 18:10:45 -07:00
parent b8872e957f
commit 4d42e5c89d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/k3s.nix
View File

@@ -11,7 +11,9 @@ with lib; let
plugins-path = pkgs.buildEnv { plugins-path = pkgs.buildEnv {
name = "combined-cni-plugins"; name = "combined-cni-plugins";
paths = [ paths = [
pkgs.cni-plugins pkgs.calico-cni-plugin pkgs.cni-plugins
pkgs.calico-cni-plugin
pkgs.calico-kube-controllers
]; ];
}; };
in { in {
@@ -51,7 +53,7 @@ in {
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 = "/opt/cni/bin";
}; };
}; };
}; };