From 52b6673b7af6c6018c9aa093692979a7a3597fd9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 12 Jan 2022 00:09:02 +0100 Subject: kubernetes/base: use cri-dockerd when docker runtime is configured --- .../kubernetes/standalone/base/templates/kubelet.service.override.j2 | 5 ----- 1 file changed, 5 deletions(-) (limited to 'roles/kubernetes/standalone') diff --git a/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 index 00f2c360..d4637c72 100644 --- a/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 +++ b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 @@ -1,11 +1,6 @@ [Service] ExecStart= ExecStart=/usr/bin/kubelet \ -{% if kubernetes_container_runtime != 'docker' %} --container-runtime=remote \ --container-runtime-endpoint={{ kubernetes_cri_socket }} \ -{% else %} - --container-runtime=docker \ - --network-plugin=cni \ -{% endif %} --config=/etc/kubernetes/kubelet.yml -- cgit v1.2.3