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

cri-o: add pinns path and witch to crio.conf.d config style

Browse Source 
This adds the pinns path to the configuration let CRI-O start properly.
We also change the configuration to the new drop-in syntax.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
Sascha Grunert 2020-08-16 12:34:51 +02:00 committed by zowoq
parent 22dcc4e08a
commit 71dd85bffa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@ in
environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml";
environment.etc."crio/crio.conf".text = '' environment.etc."crio/crio.conf.d/00-default.conf".text = ''
[crio] [crio]
storage_driver = "${cfg.storageDriver}" storage_driver = "${cfg.storageDriver}"
@ -100,6 +100,7 @@ in
cgroup_manager = "systemd" cgroup_manager = "systemd"
log_level = "${cfg.logLevel}" log_level = "${cfg.logLevel}"
manage_ns_lifecycle = true manage_ns_lifecycle = true
pinns_path = "${cfg.package}/bin/pinns"
${optionalString (cfg.runtime != null) '' ${optionalString (cfg.runtime != null) ''
default_runtime = "${cfg.runtime}" default_runtime = "${cfg.runtime}"