From 6653328aefea06f3bd504163b248253330794393 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Wed, 29 Apr 2020 09:22:10 +0200
Subject: [PATCH] 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>
---
 nixos/modules/virtualisation/cri-o.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 2af4214302d..61c1e5be277 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";