3 files changed, 10 insertions, 3 deletions
diff --git a/roles/kubernetes/base/tasks/cri_containerd.yml b/roles/kubernetes/base/tasks/cri_containerd.yml
index ff904ffc..549ccae0 100644
--- a/roles/kubernetes/base/tasks/cri_containerd.yml
+++ b/roles/kubernetes/base/tasks/cri_containerd.yml
@@ -1,7 +1,7 @@
 ---
 - name: make sure the kubernetes_cri_socket variable is configured correctly
   assert:
-    msg: "The variable kubernetes_cri_socket is not configured to use containerd as container runtime."
+    msg: "The variable kubernetes_cri_socket is not configured correctly. You might need to move your host to the group kubernetes-cluster or standalone-kubelet!"
     that:
       -  kubernetes_cri_socket == "unix:///run/containerd/containerd.sock"
 
diff --git a/roles/kubernetes/base/tasks/cri_docker.yml b/roles/kubernetes/base/tasks/cri_docker.yml
index 67196f51..50558d70 100644
--- a/roles/kubernetes/base/tasks/cri_docker.yml
+++ b/roles/kubernetes/base/tasks/cri_docker.yml
@@ -1,7 +1,14 @@
 ---
+
+- name: make sure the kubernetes_cri_socket variable is configured correctly
+  assert:
+    msg: "The variable kubernetes_cri_socket is not configured correctly. You might need to move your host to the group kubernetes-cluster or standalone-kubelet!"
+    that:
+      -  not kubernetes_cri_socket
+
 - name: disable bridge and iptables in docker daemon config
   set_fact:
-    docker_daemon_config: "{{ docker_daemon_config | default({}) | combine({'bridge': 'none', 'iptables': false}) }}"
+    docker_daemon_config: "{{ docker_daemon_config | default({}) | combine({'exec-opts': ['native.cgroupdriver=systemd'], 'bridge': 'none', 'iptables': false}) }}"
 
 - name: install docker
   include_role:
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index 721bc730..602266d5 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -37,7 +37,7 @@
     create: yes
     marker: "### {mark} ANSIBLE MANAGED BLOCK for crictl ###"
     content: |
-      {% if kubernetes_cri_socket is defined %}
+      {% if kubernetes_cri_socket %}
       alias crictl="crictl --runtime-endpoint {{ kubernetes_cri_socket }}"
       {% endif %}
       {% if item == 'zsh' %}