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

Merge pull request #85822 from zowoq/cni-collision

Browse Source 
nixos/{cri-o,podman}: remove cni-plugins from environment.systemPackages
This commit is contained in:
adisbladis 2020-04-23 11:22:01 +02:00 committed by GitHub
commit 0dc3e485a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 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}"

1
nixos/modules/virtualisation/podman.nix
View File

@ -66,7 +66,6 @@ in
pkgs.slirp4netns # User-mode networking for unprivileged namespaces pkgs.slirp4netns # User-mode networking for unprivileged namespaces
pkgs.fuse-overlayfs # CoW for images, much faster than default vfs pkgs.fuse-overlayfs # CoW for images, much faster than default vfs
pkgs.utillinux # nsenter pkgs.utillinux # nsenter
pkgs.cni-plugins # Networking plugins
pkgs.iptables pkgs.iptables
] ]
++ lib.optional cfg.dockerCompat dockerCompat; ++ lib.optional cfg.dockerCompat dockerCompat;