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

nixos/containerd: minor cleanup #122440

Merged
merged 2 commits into from May 16, 2021
Merged

nixos/containerd: minor cleanup #122440

merged 2 commits into from May 16, 2021

Conversation

johanot
Copy link
Contributor

@johanot johanot commented May 10, 2021

Motivation for this change

Turns out that I initially misunderstood the containerd directory configurations. root is where containerd wants "persistent data" and state is where "runtime state" (ephemeral) lives. See: https://github.com/containerd/containerd/blob/master/docs/ops.md#base-configuration
I've changed directories to comply with systemd/nixos standards, i.e. /var/lib/containerd and /run/containerd respectively.

Also, systemd StartLimits must be in the [unit]-section, otherwise they are ignored. While moving them to unitConfig, I had to raise the limits to get reasonable startup times, now that start-limits are actually enforced. Feel free to raise opinions on restart-interval and start-limit values, because I chose the current ones rather arbitrarily, tbh.

NixOS tests run green locally with Kubernetes 1.20.5.

I'd like this to be part of release 21.05.

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.

Johan Thomsen added 2 commits May 10, 2021 12:01
also, raise limits to ensure reasonable startup time, now that StartLimits are actually enforced
@johanot
Copy link
Contributor Author

johanot commented May 11, 2021

cc @saschagrunert @zowoq @ymatsiuk

@zowoq zowoq merged commit 7e310dd into NixOS:master May 16, 2021
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

2 participants