diff options
| author | Sascha Grunert <sgrunert@suse.com> | 2020-04-29 09:22:10 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2020-05-25 02:24:57 +0200 |
| commit | 6653328aefea06f3bd504163b248253330794393 (patch) | |
| tree | 7a91b65842d0a9c8e0aff915a5956fd5e4ab53b0 /nixos/modules/virtualisation | |
| parent | 4c1bab5057835cb547250238db44433135c5fdc6 (diff) | |
| download | nixlib-6653328aefea06f3bd504163b248253330794393.tar nixlib-6653328aefea06f3bd504163b248253330794393.tar.gz nixlib-6653328aefea06f3bd504163b248253330794393.tar.bz2 nixlib-6653328aefea06f3bd504163b248253330794393.tar.lz nixlib-6653328aefea06f3bd504163b248253330794393.tar.xz nixlib-6653328aefea06f3bd504163b248253330794393.tar.zst nixlib-6653328aefea06f3bd504163b248253330794393.zip | |
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>
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 2af4214302d6..61c1e5be277b 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -36,7 +36,7 @@ in pauseImage = mkOption { 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"; }; @@ -67,8 +67,9 @@ in [crio.runtime] conmon = "${pkgs.conmon}/bin/conmon" + cgroup_manager = "systemd" 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"; |