From 9b924b06bcaaa53884f2486b02eb5ee2ff6a1fe5 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 9 May 2021 13:50:26 +0200
Subject: kubernetes: upgrade cri-tools package

---
 roles/kubernetes/base/tasks/main.yml | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'roles/kubernetes')

diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index a104b660..a13f04fa 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -9,24 +9,39 @@
   include_role:
     name: "storage/{{ kubelet_storage.type }}/volume"
 
-- name: add apt repository
+- name: add apt repository for kubernetes packages
   include_role:
     name: apt-repo/kubernetes
 
+- name: add apt repository for cri-tools
+  include_role:
+    name: apt-repo/github-containers
+
 - name: install kubelet and common packages
   apt:
     name:
     - bridge-utils
-    - cri-tools
+    - "cri-tools={{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0~1"
     - "kubelet={{ kubernetes_version }}-00"
     state: present
     force: yes
 
-- name: disable automatic upgrades for kubelet
+- name: disable automatic upgrades for kubelet and cri-tools
+  loop:
+  - kubelet
+  - cri-tools
   dpkg_selections:
-    name: kubelet
+    name: "{{ item }}"
     selection: hold
 
+- name: configure endpoints for crictl
+  when: kubernetes_cri_socket
+  copy:
+    dest: /etc/crictl.yaml
+    content: |
+      runtime-endpoint: "{{ kubernetes_cri_socket }}"
+      image-endpoint: "{{ kubernetes_cri_socket }}"
+
 - name: add crictl config for shells
   loop:
   - zsh
@@ -36,14 +51,7 @@
     create: yes
     marker: "### {mark} ANSIBLE MANAGED BLOCK for crictl ###"
     content: |
-      {% if kubernetes_cri_socket %}
-      alias crictl="crictl --runtime-endpoint {{ kubernetes_cri_socket }}"
-      {% endif %}
-      {% if item == 'zsh' %}
-      ## TODO: see https://github.com/kubernetes-sigs/cri-tools/issues/435
-      autoload -U +X bashcompinit && bashcompinit
-      {% endif %}
-      source <(crictl completion)
+      source <(crictl completion {{ item }})
 
 - name: add dummy group with gid 990
   group:
-- 
cgit v1.2.3