From f85e79b658b9d95adc4c1e6c8e1378e06d2dc736 Mon Sep 17 00:00:00 2001 From: Adrien Date: Sat, 9 May 2020 16:10:41 +0200 Subject: [PATCH] Add CRI-O config --- defaults/main.yml | 8 +++++--- tasks/install_server.yml | 7 +++++++ templates/etc/sysconfig/kubelet.j2 | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2c26eb7..de3a66e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,7 @@ --- -kubernetes_cri: "containerd" +# value for kubernetes_cri: containerd, cri-o +#kubernetes_cri: "containerd" kubernetes_server: false -kubernetes_network: calico -kubernetes_version: 1.17.2 +# value for kuberntes_network: calico, weave-net +#kubernetes_network: calico +kubernetes_version: 1.18.2 diff --git a/tasks/install_server.yml b/tasks/install_server.yml index 4ade838..72f39f7 100644 --- a/tasks/install_server.yml +++ b/tasks/install_server.yml @@ -6,6 +6,13 @@ - kubernetes_cri == "containerd" #register: kubernetes_cri_changed +- name: Install CRI-O + include_role: + name: cri-o + when: + - kubernetes_cri == "cri-o" + #register: kubernetes_cri_changed + #- name: Restart kubelet after kubernetes cri installation # service: # name: kubelet diff --git a/templates/etc/sysconfig/kubelet.j2 b/templates/etc/sysconfig/kubelet.j2 index 973f8c5..451c814 100644 --- a/templates/etc/sysconfig/kubelet.j2 +++ b/templates/etc/sysconfig/kubelet.j2 @@ -1 +1 @@ -KUBELET_EXTRA_ARGS="--cgroup-driver=systemd --container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --node-ip={{ ansible_eth0.ipv4.address }}" +KUBELET_EXTRA_ARGS="--cgroup-driver=systemd --container-runtime=remote --runtime-request-timeout=15m --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 }}"