diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-05-15 23:44:29 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-05-15 23:44:29 +0200 |
| commit | 14824c28b863f0028822f3ab92f8b9199cda7322 (patch) | |
| tree | bf6c0415146ccfe3498f2e2c16812ef2304cf9e0 /roles/kubernetes/base | |
| parent | Merge branch 'topic/k8s-containerd' (diff) | |
k8s: cleanup CRI socket handling
Diffstat (limited to 'roles/kubernetes/base')
| -rw-r--r-- | roles/kubernetes/base/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/kubernetes/base/tasks/cri_docker.yml | 2 | ||||
| -rw-r--r-- | roles/kubernetes/base/tasks/main.yml | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/roles/kubernetes/base/defaults/main.yml b/roles/kubernetes/base/defaults/main.yml new file mode 100644 index 00000000..d5eccc59 --- /dev/null +++ b/roles/kubernetes/base/defaults/main.yml @@ -0,0 +1,2 @@ +--- +kubernetes_cri_tools_pkg_version: "{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0~1" diff --git a/roles/kubernetes/base/tasks/cri_docker.yml b/roles/kubernetes/base/tasks/cri_docker.yml index 88b35508..a9b5dec1 100644 --- a/roles/kubernetes/base/tasks/cri_docker.yml +++ b/roles/kubernetes/base/tasks/cri_docker.yml @@ -3,7 +3,7 @@ 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 + - kubernetes_cri_socket == "unix:///var/run/dockershim.sock" - name: create systemd snippet directory file: diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index a13f04fa..adbd24aa 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -21,7 +21,7 @@ apt: name: - bridge-utils - - "cri-tools={{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0~1" + - "cri-tools={{ kubernetes_cri_tools_pkg_version }}" - "kubelet={{ kubernetes_version }}-00" state: present force: yes @@ -35,7 +35,6 @@ selection: hold - name: configure endpoints for crictl - when: kubernetes_cri_socket copy: dest: /etc/crictl.yaml content: | |