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

cri-o: update module configuration 

- Update the default pause image
- Set the cgroup manager to systemd
- Enable `manage_ns_lifecycle` instead of the deprecated
  `manage_network_ns_lifecycle` option

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
Sascha Grunert 2020-04-29 09:22:10 +02:00 committed by Profpatsch
parent 4c1bab5057
commit 6653328aef
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ in
pauseImage = mkOption { pauseImage = mkOption {
type = types.str; type = types.str;
default = "k8s.gcr.io/pause:3.1"; default = "k8s.gcr.io/pause:3.2";
description = "Pause image for pod sandboxes to be used"; description = "Pause image for pod sandboxes to be used";
}; };
@ -67,8 +67,9 @@ in
[crio.runtime] [crio.runtime]
conmon = "${pkgs.conmon}/bin/conmon" conmon = "${pkgs.conmon}/bin/conmon"
cgroup_manager = "systemd"
log_level = "${cfg.logLevel}" log_level = "${cfg.logLevel}"
manage_network_ns_lifecycle = true manage_ns_lifecycle = true
''; '';
environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o.src}/contrib/cni/10-crio-bridge.conf"; environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o.src}/contrib/cni/10-crio-bridge.conf";