From 7c6ee0b6344b7d7d874d5755d449ed4503c02721 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 17 Mar 2020 17:38:43 +0100
Subject: kubernetes: some more harmonization

---
 roles/kubernetes/standalone/templates/kubelet.service.override.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'roles/kubernetes/standalone/templates/kubelet.service.override.j2')

diff --git a/roles/kubernetes/standalone/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/templates/kubelet.service.override.j2
index 75061e73..3eb8b63d 100644
--- a/roles/kubernetes/standalone/templates/kubelet.service.override.j2
+++ b/roles/kubernetes/standalone/templates/kubelet.service.override.j2
@@ -2,9 +2,9 @@
 ExecStart=
 ExecStart=/usr/bin/kubelet \
   --config=/etc/kubernetes/kubelet.yml \
-{% if kubernetes_container_runtime == 'containerd' %}
+{% if kubernetes_cri_socket is defined %}
   --container-runtime=remote \
-  --container-runtime-endpoint=unix:///run/containerd/containerd.sock \
+  --container-runtime-endpoint={{ kubernetes_cri_socket }} \
 {% endif %}
   --network-plugin=cni \
   --cloud-provider=
-- 
cgit v1.2.3