From 473a8beff0697ae122feae625db94c78c456d1fc Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Thu, 9 Apr 2020 17:43:46 +0200
Subject: [PATCH] Remove hard-coded dependance to docker.service in
kubelet.service file (#5917)
---
roles/kubernetes/node/templates/kubelet.service.j2 | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/roles/kubernetes/node/templates/kubelet.service.j2 b/roles/kubernetes/node/templates/kubelet.service.j2
index 71c97e0d0..39492534e 100644
--- a/roles/kubernetes/node/templates/kubelet.service.j2
+++ b/roles/kubernetes/node/templates/kubelet.service.j2
@@ -1,8 +1,12 @@
[Unit]
Description=Kubernetes Kubelet Server
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-After=docker.service
+After={{ container_manager }}.service
+{% if container_manager == 'docker' %}
Wants=docker.socket
+{% else %}
+Wants={{ container_manager }}.service
+{% endif %}
[Service]
User=root
--
GitLab