diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-23 08:37:04 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-23 10:29:11 +1000 |
| commit | 54b59dd6c006d498f5f261aeff7923e7140939ee (patch) | |
| tree | 076f83166966a95af75ab3c3665d08b4d67942b8 /nixos/modules/virtualisation | |
| parent | c52cc1953c8c8bf55b52820cb808b060c3d3dcf3 (diff) | |
| download | nixlib-54b59dd6c006d498f5f261aeff7923e7140939ee.tar nixlib-54b59dd6c006d498f5f261aeff7923e7140939ee.tar.gz nixlib-54b59dd6c006d498f5f261aeff7923e7140939ee.tar.bz2 nixlib-54b59dd6c006d498f5f261aeff7923e7140939ee.tar.lz nixlib-54b59dd6c006d498f5f261aeff7923e7140939ee.tar.xz nixlib-54b59dd6c006d498f5f261aeff7923e7140939ee.tar.zst nixlib-54b59dd6c006d498f5f261aeff7923e7140939ee.zip | |
nixos/cri-o: remove cni-plugins from environment.systemPackages
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 7882b7fc19de..9bedb6be54a4 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -42,7 +42,7 @@ in config = mkIf cfg.enable { 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 = '' runtime-endpoint: unix:///var/run/crio/crio.sock ''; @@ -57,6 +57,10 @@ in ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries} ] + [crio.network] + plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + network_dir = "/etc/cni/net.d/" + [crio.runtime] conmon = "${pkgs.conmon}/bin/conmon" log_level = "${cfg.logLevel}" |