Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cri-o: update module configuration #86290

Merged
merged 1 commit into from May 25, 2020
Merged

Conversation

saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented Apr 29, 2020

Motivation for this change
  • Update the default pause image
  • Set the cgroup manager to systemd
  • Enable manage_ns_lifecycle instead of the deprecated
    manage_network_ns_lifecycle option
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@zowoq zowoq left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @NixOS/podman

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐯

@@ -61,9 +61,9 @@ in
network_dir = "/etc/cni/net.d/"

[crio.runtime]
conmon = "${pkgs.conmon}/bin/conmon"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saschagrunert Could you readd the conmon path please, it's needed for #86637?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed 👍

- 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>
@zowoq
Copy link
Contributor

zowoq commented May 7, 2020

@adisbladis Could you merge this please?

@zowoq
Copy link
Contributor

zowoq commented May 14, 2020

@adisbladis Ping

@Profpatsch Profpatsch merged commit 6653328 into NixOS:master May 25, 2020
@saschagrunert saschagrunert deleted the crio-module branch May 25, 2020 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants