diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2021-09-22 16:11:49 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2021-09-22 16:11:49 +0200 |
| commit | 5abd562a1867c0f77de2531d652c24f709ed86e8 (patch) | |
| tree | 0f57eeb510b8d58714e2779f7830541c8caa3335 /nixos | |
| parent | 22d05f8fa2bb4ed7d6371dd3d1b7b21c28c78f27 (diff) | |
| download | nixpkgs-5abd562a1867c0f77de2531d652c24f709ed86e8.tar nixpkgs-5abd562a1867c0f77de2531d652c24f709ed86e8.tar.gz nixpkgs-5abd562a1867c0f77de2531d652c24f709ed86e8.tar.bz2 nixpkgs-5abd562a1867c0f77de2531d652c24f709ed86e8.tar.lz nixpkgs-5abd562a1867c0f77de2531d652c24f709ed86e8.tar.xz nixpkgs-5abd562a1867c0f77de2531d652c24f709ed86e8.tar.zst nixpkgs-5abd562a1867c0f77de2531d652c24f709ed86e8.zip | |
nixos/kubernetes: fix deprecation warning
The option `containerd.configFile` has been replaced by an equivalent `settings` attribute set.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/default.nix | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 33d217ba60e..f2c76a56d8d 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -5,28 +5,33 @@ with lib; let cfg = config.services.kubernetes; - defaultContainerdConfigFile = pkgs.writeText "containerd.toml" '' - version = 2 - root = "/var/lib/containerd" - state = "/run/containerd" - oom_score = 0 - - [grpc] - address = "/run/containerd/containerd.sock" + defaultContainerdSettings = { + version = 2; + root = "/var/lib/containerd"; + state = "/run/containerd"; + oom_score = 0; + + grpc = { + address = "/run/containerd/containerd.sock"; + }; - [plugins."io.containerd.grpc.v1.cri"] - sandbox_image = "pause:latest" + plugins."io.containerd.grpc.v1.cri" = { + sandbox_image = "pause:latest"; - [plugins."io.containerd.grpc.v1.cri".cni] - bin_dir = "/opt/cni/bin" - max_conf_num = 0 + cni = { + bin_dir = "/opt/cni/bin"; + max_conf_num = 0; + }; - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" + containerd.runtimes.runc = { + runtime_type = "io.containerd.runc.v2"; + }; - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes."io.containerd.runc.v2".options] - SystemdCgroup = true - ''; + containerd.runtimes."io.containerd.runc.v2".options = { + SystemdCgroup = true; + }; + }; + }; mkKubeConfig = name: conf: pkgs.writeText "${name}-kubeconfig" (builtins.toJSON { apiVersion = "v1"; @@ -248,7 +253,7 @@ in { (mkIf cfg.kubelet.enable { virtualisation.containerd = { enable = mkDefault true; - configFile = mkDefault defaultContainerdConfigFile; + settings = mkDefault defaultContainerdSettings; }; }) |