fix: remove cri binding (#45)

.github/workflows/tests.yml

@@ -59,3 +59,6 @@ jobs:
       - name: Run tests
         run: |
           molecule test --scenario-name "${{ matrix.scenario }}"
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'

.yamllint

@@ -24,6 +24,7 @@ rules:
   comments-indentation: disable
   document-start:
     present: true
+    level: error
   empty-lines:
     max: 3
     level: error

molecule/configure-k8s-instances.yml

@@ -0,0 +1,24 @@
+---
+
+- name: Install Python
+  ansible.builtin.raw: apt update && apt install -y python3-pip python3 python3-apt
+  changed_when: false
+
+- name: Install prerequisites
+  ansible.builtin.apt:
+    name:
+      - iproute2  # provides network facts
+      - kmod  # modprobe and lsmod
+      - net-tools
+      - curl
+    update_cache: true
+- name: Collect facts
+  ansible.builtin.setup:
+
+- name: Make containerd defautl to crictl
+  ansible.builtin.copy:
+    content: "runtime-endpoint: unix:///var/run/containerd/containerd.sock\n"
+    dest: /etc/crictl.yaml
+    owner: root
+    group: root
+    mode: 0640

molecule/default/converge.yml

@@ -17,20 +17,9 @@
   hosts: all
   gather_facts: false
   tasks:
-    - name: Install Python
-      ansible.builtin.raw: apt update && apt install -y python3-pip python3 python3-apt
-      changed_when: false
-
-    - name: Install prerequisites
-      ansible.builtin.apt:
-        name:
-          - iproute2  # provides network facts
-          - kmod  # modprobe and lsmod
-          - net-tools
-          - curl
-        update_cache: true
-    - name: Collect facts
-      ansible.builtin.setup:
+    - name: Include configure for k8s instances
+      ansible.builtin.include_tasks:
+        file: ../configure-k8s-instances.yml
 
 - name: Converge
   hosts: all

molecule/default_ext-etcd-sec/converge.yml

@@ -17,20 +17,9 @@
   hosts: control_plane
   gather_facts: false
   tasks:
-    - name: Install Python
-      ansible.builtin.raw: apt update && apt install -y python3-pip python3 python3-apt
-      changed_when: false
-
-    - name: Install prerequisites
-      ansible.builtin.apt:
-        name:
-          - iproute2  # provides network facts
-          - kmod  # modprobe and lsmod
-          - net-tools
-          - curl
-        update_cache: true
-    - name: Collect facts
-      ansible.builtin.setup:
+    - name: Include configure for k8s instances
+      ansible.builtin.include_tasks:
+        file: ../configure-k8s-instances.yml
 
 - name: Configure certs
   hosts: all

molecule/default_join-workers/converge.yml

@@ -17,26 +17,15 @@
   hosts: all
   gather_facts: false
   tasks:
-    - name: Install Python
-      ansible.builtin.raw: apt update && apt install -y python3-pip python3 python3-apt
-      changed_when: false
+    - name: Include configure for k8s instances
+      ansible.builtin.include_tasks:
+        file: ../configure-k8s-instances.yml
 
 - name: Converge
   hosts: all
   become: yes
   become_method: su
   gather_facts: false
-  pre_tasks:
-    - name: Install prerequisites
-      ansible.builtin.apt:
-        name:
-          - iproute2  # provides network facts
-          - kmod  # modprobe and lsmod
-          - net-tools
-          - curl
-        update_cache: true
-    - name: Collect facts
-      ansible.builtin.setup:
   tasks:
     - name: "Include cloudlabsinfra.k8s_cluster"
       ansible.builtin.include_role:

molecule/default_multi-master/converge.yml

@@ -17,25 +17,15 @@
   hosts: all
   gather_facts: false
   tasks:
-    - name: Install Python
-      ansible.builtin.raw: apt update && apt install -y python3-pip python3 python3-apt
-      changed_when: False
+    - name: Include configure for k8s instances
+      ansible.builtin.include_tasks:
+        file: ../configure-k8s-instances.yml
 
 - name: Converge
   hosts: all
   become: yes
   become_method: su
   gather_facts: false
-  pre_tasks:
-    - name: Install prerequisites
-      ansible.builtin.apt:
-        name:
-          - iproute2  # provides network facts
-          - kmod  # modprobe and lsmod
-          - net-tools
-        update_cache: true
-    - name: Collect facts
-      ansible.builtin.setup:
   tasks:
     - name: "Include cloudlabsinfra.k8s_cluster"
       ansible.builtin.include_role:

molecule/end-to-end/converge.yml

@@ -19,14 +19,9 @@
     - workers
   gather_facts: false
   tasks:
-    - name: Install Python
-      ansible.builtin.raw: apt update && apt install -y python3-pip python3 python3-apt
-      changed_when: false
-    - name: Install prerequisites
-      ansible.builtin.apt:
-        name:
-          - kmod  # modprobe and lsmod
-        update_cache: true
+    - name: Include configure for k8s instances
+      ansible.builtin.include_tasks:
+        file: ../configure-k8s-instances.yml
 
 - name: Pre configure all hosts
   hosts: all

tasks/configure.yml

@@ -85,14 +85,6 @@
         - net.bridge.bridge-nf-call-ip6tables
         - net.ipv4.ip_forward
 
-    - name: Make containerd defautl to crictl
-      ansible.builtin.copy:
-        content: "runtime-endpoint: unix:///var/run/containerd/containerd.sock\n"
-        dest: /etc/crictl.yaml
-        owner: root
-        group: root
-        mode: 0640
-
     - name: Create kubelet root directory
       ansible.builtin.file:
         path: "{{ k8s_cluster_kubelet_config_root_dir }}"