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/tests/kubernetes | |
| parent | 2d356a19690de6bd20f89ffbc36135b7c3c36da5 (diff) | |
| download | nixpkgs-97864e984d89248e74b13be175a1cfe9e16d984e.tar nixpkgs-97864e984d89248e74b13be175a1cfe9e16d984e.tar.gz nixpkgs-97864e984d89248e74b13be175a1cfe9e16d984e.tar.bz2 nixpkgs-97864e984d89248e74b13be175a1cfe9e16d984e.tar.lz nixpkgs-97864e984d89248e74b13be175a1cfe9e16d984e.tar.xz nixpkgs-97864e984d89248e74b13be175a1cfe9e16d984e.tar.zst nixpkgs-97864e984d89248e74b13be175a1cfe9e16d984e.zip | |
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/tests/kubernetes')
| -rw-r--r-- | nixos/tests/kubernetes/base.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index e1736f6fe17..f0c72084be5 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -60,13 +60,6 @@ let advertiseAddress = master.ip; }; masterAddress = "${masterName}.${config.networking.domain}"; - # workaround for: - # https://github.com/kubernetes/kubernetes/issues/102676 - # (workaround from) https://github.com/kubernetes/kubernetes/issues/95488 - kubelet.extraOpts = ''\ - --cgroups-per-qos=false \ - --enforce-node-allocatable="" \ - ''; }; } (optionalAttrs (any (role: role == "master") machine.roles) { |