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

nixos/cri-o: default to upstream pause

Browse Source
This commit is contained in:
zowoq 2020-05-07 09:13:27 +10:00 committed by Profpatsch
parent eeff166faa
commit 2689dfaa08
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,15 +37,17 @@ in
}; };
pauseImage = mkOption { pauseImage = mkOption {
type = types.str; type = types.nullOr types.str;
default = "k8s.gcr.io/pause:3.2"; default = null;
description = "Pause image for pod sandboxes to be used"; description = "Override the default pause image for pod sandboxes";
example = [ "k8s.gcr.io/pause:3.2" ];
}; };
pauseCommand = mkOption { pauseCommand = mkOption {
type = types.str; type = types.nullOr types.str;
default = "/pause"; default = null;
description = "Pause command to be executed"; description = "Override the default pause command";
example = [ "/pause" ];
}; };
runtime = mkOption { runtime = mkOption {
@ -88,8 +90,8 @@ in
storage_driver = "${cfg.storageDriver}" storage_driver = "${cfg.storageDriver}"
[crio.image] [crio.image]
pause_image = "${cfg.pauseImage}" ${optionalString (cfg.pauseImage != null) ''pause_image = "${cfg.pauseImage}"''}
pause_command = "${cfg.pauseCommand}" ${optionalString (cfg.pauseCommand != null) ''pause_command = "${cfg.pauseCommand}"''}
[crio.network] [crio.network]
plugin_dirs = ["${pkgs.cni-plugins}/bin/"] plugin_dirs = ["${pkgs.cni-plugins}/bin/"]