diff options
| author | Thomas Dy <thatsmydoing@gmail.com> | 2021-12-18 22:18:10 +0900 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-01-08 17:29:32 +1000 |
| commit | 97864e984d89248e74b13be175a1cfe9e16d984e (patch) | |
| tree | bb955be0d3a23be98ac0ea4a2a8d416ae8d388e2 /nixos/modules/services/cluster | |
| parent | 2d356a19690de6bd20f89ffbc36135b7c3c36da5 (diff) | |
nixos/kubernetes: actually set containerd to use systemd cgroups
The correct configuration is listed in the kubernetes documentation https://kubernetes.io/docs/setup/production-environment/container-runtimes/#containerd-systemd The correct option can also be seen in `containerd config default`
Diffstat (limited to 'nixos/modules/services/cluster')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/default.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/kubelet.nix | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index ae10657202d9c..35ec99d83c842 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -26,10 +26,7 @@ let containerd.runtimes.runc = { runtime_type = "io.containerd.runc.v2"; - }; - - containerd.runtimes."io.containerd.runc.v2".options = { - SystemdCgroup = true; + options.SystemdCgroup = true; }; }; }; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 253355c20cb2f..af3a5062febc9 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -264,8 +264,6 @@ in "net.bridge.bridge-nf-call-ip6tables" = 1; }; - systemd.enableUnifiedCgroupHierarchy = false; # true breaks node memory metrics - systemd.services.kubelet = { description = "Kubernetes Kubelet Service"; wantedBy = [ "kubernetes.target" ]; |