diff options
| author | Johan Thomsen <jth@dbc.dk> | 2021-05-10 12:01:10 +0200 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-05-17 06:17:18 +1000 |
| commit | 2142f885261a690a17a9e208b4cff270c6e3386a (patch) | |
| tree | 7e2bdfd9fe6769d31e27a4396913bcf4078ca7a8 | |
| parent | 08ab7e10f3b5bfa0a87df22f764179ccebf21707 (diff) | |
nixos/containerd: sanitize StateDirectory and RuntimeDirectory
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/default.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/kubelet.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/containerd.nix | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 19edc338bba1b..0dc3649237b7f 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -7,12 +7,12 @@ let defaultContainerdConfigFile = pkgs.writeText "containerd.toml" '' version = 2 - root = "/var/lib/containerd/daemon" - state = "/var/run/containerd/daemon" + root = "/var/lib/containerd" + state = "/run/containerd" oom_score = 0 [grpc] - address = "/var/run/containerd/containerd.sock" + address = "/run/containerd/containerd.sock" [plugins."io.containerd.grpc.v1.cri"] sandbox_image = "pause:latest" diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index a428a60800cd6..fcfcc84354772 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -134,7 +134,7 @@ in containerRuntimeEndpoint = mkOption { description = "Endpoint at which to find the container runtime api interface/socket"; type = str; - default = "unix:///var/run/containerd/containerd.sock"; + default = "unix:///run/containerd/containerd.sock"; }; enable = mkEnableOption "Kubernetes kubelet."; diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index 194276d169588..6d6ba454bd841 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -54,6 +54,9 @@ in LimitNOFILE = "infinity"; TasksMax = "infinity"; OOMScoreAdjust = "-999"; + + StateDirectory = "containerd"; + RuntimeDirectory = "containerd"; }; }; }; |