diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-05-07 09:13:27 +1000 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2020-05-25 12:27:49 +0200 |
| commit | 2689dfaa0817b2412789cedd676c22e776734c9d (patch) | |
| tree | a396866525df7b0816f4b18395b4c53f184b2ab2 /nixos/modules/virtualisation | |
| parent | eeff166faa82fd8a38c8da632863e2203ccf8235 (diff) | |
| download | nixlib-2689dfaa0817b2412789cedd676c22e776734c9d.tar nixlib-2689dfaa0817b2412789cedd676c22e776734c9d.tar.gz nixlib-2689dfaa0817b2412789cedd676c22e776734c9d.tar.bz2 nixlib-2689dfaa0817b2412789cedd676c22e776734c9d.tar.lz nixlib-2689dfaa0817b2412789cedd676c22e776734c9d.tar.xz nixlib-2689dfaa0817b2412789cedd676c22e776734c9d.tar.zst nixlib-2689dfaa0817b2412789cedd676c22e776734c9d.zip | |
nixos/cri-o: default to upstream pause
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 04f3c66915ef..f267c97b1788 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -37,15 +37,17 @@ in }; pauseImage = mkOption { - type = types.str; - default = "k8s.gcr.io/pause:3.2"; - description = "Pause image for pod sandboxes to be used"; + type = types.nullOr types.str; + default = null; + description = "Override the default pause image for pod sandboxes"; + example = [ "k8s.gcr.io/pause:3.2" ]; }; pauseCommand = mkOption { - type = types.str; - default = "/pause"; - description = "Pause command to be executed"; + type = types.nullOr types.str; + default = null; + description = "Override the default pause command"; + example = [ "/pause" ]; }; runtime = mkOption { @@ -88,8 +90,8 @@ in storage_driver = "${cfg.storageDriver}" [crio.image] - pause_image = "${cfg.pauseImage}" - pause_command = "${cfg.pauseCommand}" + ${optionalString (cfg.pauseImage != null) ''pause_image = "${cfg.pauseImage}"''} + ${optionalString (cfg.pauseCommand != null) ''pause_command = "${cfg.pauseCommand}"''} [crio.network] plugin_dirs = ["${pkgs.cni-plugins}/bin/"] |