+9
nixos/doc/manual/release-notes/rl-2105.xml
+9
nixos/doc/manual/release-notes/rl-2105.xml
···+Kubernetes has <link xlink:href="https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/">deprecated docker</link> as container runtime.+As a consequence, the Kubernetes module now has support for configuration of custom remote container runtimes and enables containerd by default.+As an example, images with CMD or ENTRYPOINT defined as strings (not lists) will fail on containerd, while working fine on docker.
+1
nixos/modules/module-list.nix
+1
nixos/modules/module-list.nix
···
-2
nixos/modules/services/cluster/kubernetes/apiserver.nix
-2
nixos/modules/services/cluster/kubernetes/apiserver.nix
······
+25
-8
nixos/modules/services/cluster/kubernetes/default.nix
+25
-8
nixos/modules/services/cluster/kubernetes/default.nix
·········
+2
-38
nixos/modules/services/cluster/kubernetes/flannel.nix
+2
-38
nixos/modules/services/cluster/kubernetes/flannel.nix
···-makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "${pkgs.kubernetes}/bin/mk-docker-opts.sh"···
+20
-7
nixos/modules/services/cluster/kubernetes/kubelet.nix
+20
-7
nixos/modules/services/cluster/kubernetes/kubelet.nix
··················
+2
-4
nixos/modules/services/networking/flannel.nix
+2
-4
nixos/modules/services/networking/flannel.nix
···until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'···
+60
nixos/modules/virtualisation/containerd.nix
+60
nixos/modules/virtualisation/containerd.nix
···+containerdConfigChecked = pkgs.runCommand "containerd-config-checked.toml" { nativeBuildInputs = [pkgs.containerd]; } ''+virtualisation.containerd.args.config = lib.mkIf (cfg.configFile != null) (toString containerdConfigChecked);+ExecStart = ''${pkgs.containerd}/bin/containerd ${lib.concatStringsSep " " (lib.cli.toGNUCommandLine {} cfg.args)}'';+# "limits" defined below are adopted from upstream: https://github.com/containerd/containerd/blob/master/containerd.service
+7
-8
nixos/tests/kubernetes/dns.nix
+7
-8
nixos/tests/kubernetes/dns.nix
······-# virtualisation.docker.extraOptions = "--dns=${config.services.kubernetes.addons.dns.clusterIp}";············
+3
-3
nixos/tests/kubernetes/rbac.nix
+3
-3
nixos/tests/kubernetes/rbac.nix
·········
-2
pkgs/applications/networking/cluster/kubernetes/default.nix
-2
pkgs/applications/networking/cluster/kubernetes/default.nix
-113
pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh
-113
pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh
···