public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/cri-o: remove cni-plugins from environment.systemPackages

Browse Source
This commit is contained in:
zowoq 2020-04-23 08:37:04 +10:00
parent c52cc1953c
commit 54b59dd6c0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/virtualisation/cri-o.nix
View File

@ -42,7 +42,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs;
[ cri-o cri-tools conmon cni-plugins iptables runc utillinux ]; [ cri-o cri-tools conmon iptables runc utillinux ];
environment.etc."crictl.yaml".text = '' environment.etc."crictl.yaml".text = ''
runtime-endpoint: unix:///var/run/crio/crio.sock runtime-endpoint: unix:///var/run/crio/crio.sock
''; '';
@ -57,6 +57,10 @@ in
${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries} ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries}
] ]
[crio.network]
plugin_dirs = ["${pkgs.cni-plugins}/bin/"]
network_dir = "/etc/cni/net.d/"
[crio.runtime] [crio.runtime]
conmon = "${pkgs.conmon}/bin/conmon" conmon = "${pkgs.conmon}/bin/conmon"
log_level = "${cfg.logLevel}" log_level = "${cfg.logLevel}"