From f160dfa618cb85a6be59d629b74c9b375deb1db9 Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Sat, 6 Jun 2020 01:21:16 +0200
Subject: [PATCH] Ajout de la reconnaissance de systemd

---
 tasks/install_server.yml           | 16 ++++++++++++++++
 templates/etc/sysconfig/kubelet.j2 |  2 +-
 templates/kubeadm-config.yaml.j2   |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tasks/install_server.yml b/tasks/install_server.yml
index 659abe0..9014a08 100644
--- a/tasks/install_server.yml
+++ b/tasks/install_server.yml
@@ -60,6 +60,8 @@
     group: root
     owner: root
     mode: 0755
+  when:
+    - ansible_service_mgr == "systemd"
 
 - name: Configure kubelet service
   template:
@@ -71,6 +73,20 @@
   with_items:
     - "systemd/system/kubelet.service.d/0-kubelet-extra-args.conf"
 #    - "sysconfig/kubelet"
+  when:
+    - ansible_service_mgr == "systemd"
+
+- name: Configure kubelet service
+  template:
+    src: "etc/{{ item }}.j2"
+    dest: "/etc/{{ item }}"
+    group: root
+    owner: root
+    mode: 0644
+  with_items:
+    - "sysconfig/kubelet"
+  when:
+    - not ansible_service_mgr == "systemd"
 
 - name: Enable kubelet on boot
   service:
diff --git a/templates/etc/sysconfig/kubelet.j2 b/templates/etc/sysconfig/kubelet.j2
index 14d6f67..8d34dfb 100644
--- a/templates/etc/sysconfig/kubelet.j2
+++ b/templates/etc/sysconfig/kubelet.j2
@@ -1,2 +1,2 @@
 #https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/#feature-gates
-KUBELET_EXTRA_ARGS="--cgroup-driver=systemd --container-runtime=remote --runtime-request-timeout=5m --container-runtime-endpoint={% if kubernetes_cri == "containerd" %}unix:///run/containerd/containerd.sock{% elif kubernetes_cri == "cri-o" %}unix:///var/run/crio/crio.sock{% endif %} --node-ip={{ ansible_eth0.ipv4.address }}"
+KUBELET_EXTRA_ARGS="{% if ansible_service_mgr == "systemd" %}--cgroup-driver=systemd {% endif %}--container-runtime=remote --runtime-request-timeout=5m --container-runtime-endpoint={% if kubernetes_cri == "containerd" %}unix:///run/containerd/containerd.sock{% elif kubernetes_cri == "cri-o" %}unix:///var/run/crio/crio.sock{% endif %} --node-ip={{ ansible_eth0.ipv4.address }}"
diff --git a/templates/kubeadm-config.yaml.j2 b/templates/kubeadm-config.yaml.j2
index 820c4f8..a2a46e5 100644
--- a/templates/kubeadm-config.yaml.j2
+++ b/templates/kubeadm-config.yaml.j2
@@ -22,7 +22,9 @@ nodeRegistration:
     effect: "NoSchedule"
 {% endif %}
   kubeletExtraArgs:
+{% if ansible_service_mgr == "systemd" %}
     cgroup-driver: "systemd"
+{% endif %}
     container-runtime: "remote"
     runtime-request-timeout: "5m"
 {% if kubernetes_cri == "containerd" %}