From ca5095f497711eb76238b8f7028c4cdcf4889e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Fri, 11 Dec 2020 12:40:24 +0100 Subject: [PATCH] app-emulation/containerd: Enable the CRI plugin Kubernetes uses containerd through the cri plugin which currently is disabled due to it listening on a TCP port. Now the plugin is not listening on a TCP port anymore but uses the same socket as gRPC. We have documented how to enable it in https://kinvolk.io/docs/flatcar-container-linux/latest/container-runtimes/switching-from-docker-to-containerd-for-kubernetes/ but it should work by default. Fixes https://github.com/kinvolk/Flatcar/issues/283 --- .../coreos-overlay/app-emulation/containerd/files/config.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml index 2b37f3c106..9fe833064c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml @@ -6,8 +6,7 @@ state = "/run/docker/libcontainerd/containerd" subreaper = true # set containerd's OOM score oom_score = -999 -# CRI plugin listens on a TCP port by default -disabled_plugins = ["cri"] +disabled_plugins = [] # grpc configuration [grpc]