diff options
Diffstat (limited to 'roles/kubernetes/base/tasks')
| -rw-r--r-- | roles/kubernetes/base/tasks/cri_containerd.yml | 6 | ||||
| -rw-r--r-- | roles/kubernetes/base/tasks/main.yml | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/roles/kubernetes/base/tasks/cri_containerd.yml b/roles/kubernetes/base/tasks/cri_containerd.yml index aa34e6fe..ff904ffc 100644 --- a/roles/kubernetes/base/tasks/cri_containerd.yml +++ b/roles/kubernetes/base/tasks/cri_containerd.yml @@ -1,4 +1,10 @@ --- +- 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." + that: + - kubernetes_cri_socket == "unix:///run/containerd/containerd.sock" + - name: install containerd include_role: name: containerd diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index 17251b82..28d6a62e 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -54,8 +54,8 @@ create: yes marker: "### {mark} ANSIBLE MANAGED BLOCK for crictl ###" content: | - {% if kubernetes_container_runtime == 'containerd' %} - alias crictl="crictl --runtime-endpoint unix:///run/containerd/containerd.sock" + {% if kubernetes_cri_socket is defined %} + alias crictl="crictl --runtime-endpoint {{ kubernetes_cri_socket }}" {% endif %} {% if item == 'zsh' %} ## TODO: see https://github.com/kubernetes-sigs/cri-tools/issues/435 |