From 14824c28b863f0028822f3ab92f8b9199cda7322 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 15 May 2021 23:44:29 +0200
Subject: k8s: cleanup CRI socket handling

---
 .../standalone/base/templates/kubelet.service.override.j2         | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 d7105856..00f2c360 100644
--- a/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2
+++ b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2
@@ -1,9 +1,11 @@
 [Service]
 ExecStart=
 ExecStart=/usr/bin/kubelet \
-  --config=/etc/kubernetes/kubelet.yml \
-{% if kubernetes_cri_socket %}
+{% if kubernetes_container_runtime != 'docker' %}
   --container-runtime=remote \
   --container-runtime-endpoint={{ kubernetes_cri_socket }} \
-{% endif %}
+{% else %}
+  --container-runtime=docker \
   --network-plugin=cni \
+{% endif %}
+  --config=/etc/kubernetes/kubelet.yml
-- 
cgit v1.2.3