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

nixos/containerd: sanitize StateDirectory and RuntimeDirectory

Browse Source
This commit is contained in:
Johan Thomsen 2021-05-10 12:01:10 +02:00 committed by zowoq
parent 08ab7e10f3
commit 2142f88526
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/cluster/kubernetes/default.nix
View File

@ -7,12 +7,12 @@ let
defaultContainerdConfigFile = pkgs.writeText "containerd.toml" '' defaultContainerdConfigFile = pkgs.writeText "containerd.toml" ''
version = 2 version = 2
root = "/var/lib/containerd/daemon" root = "/var/lib/containerd"
state = "/var/run/containerd/daemon" state = "/run/containerd"
oom_score = 0 oom_score = 0
[grpc] [grpc]
address = "/var/run/containerd/containerd.sock" address = "/run/containerd/containerd.sock"
[plugins."io.containerd.grpc.v1.cri"] [plugins."io.containerd.grpc.v1.cri"]
sandbox_image = "pause:latest" sandbox_image = "pause:latest"

2
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@ -134,7 +134,7 @@ in
containerRuntimeEndpoint = mkOption { containerRuntimeEndpoint = mkOption {
description = "Endpoint at which to find the container runtime api interface/socket"; description = "Endpoint at which to find the container runtime api interface/socket";
type = str; type = str;
default = "unix:///var/run/containerd/containerd.sock"; default = "unix:///run/containerd/containerd.sock";
}; };
enable = mkEnableOption "Kubernetes kubelet."; enable = mkEnableOption "Kubernetes kubelet.";

3
nixos/modules/virtualisation/containerd.nix
View File

@ -54,6 +54,9 @@ in
LimitNOFILE = "infinity"; LimitNOFILE = "infinity";
TasksMax = "infinity"; TasksMax = "infinity";
OOMScoreAdjust = "-999"; OOMScoreAdjust = "-999";
StateDirectory = "containerd";
RuntimeDirectory = "containerd";
}; };
}; };
}; };