Add support to cri-dockerd #168

README.md

@@ -61,12 +61,9 @@ The variables that can be passed to this role and a brief description about them
 	# Email to be used in the Let's Encrypt issuer
 	kube_cert_user_email: [email protected]
 	# Override default docker version
-	# (installed when not in kube_docker_compatible_versions)
 	kube_docker_version: ""
 	# Options to add in the docker.json file
 	kube_docker_options: {}
-	# Compatible docker versions
-	kube_docker_compatible_versions: ['17.03.', '18.06.', '18.09.', '19.03.']
 	# Install docker with pip
 	kube_install_docker_pip
 	# Command flags to use for launching k3s in the systemd service

defaults/main.yml

@@ -25,6 +25,8 @@ kubelet_extra_args_dict: {}
 kube_apiserver_options: []
 # CRI runtime
 kube_cri_runtime: docker # docker, containerd or crio
+# CRI dockerd version
+kube_cri_dockerd_version: "0.3.4"
 # Flag to set HELM to be installed
 kube_install_helm: true
 # Helm version
@@ -82,12 +84,9 @@ kube_cert_manager_challenge_dns01_sk: ''
 # Optionally a wildcard dns certificate name can be set
 kube_cert_manager_wildcard_cert_dns_name: ''
 # Override default docker version
-# (installed when not in kube_docker_compatible_versions)
 kube_docker_version: ""
 # Options to add in the docker.json file
 kube_docker_options: {}
-# Compatible docker versions
-kube_docker_compatible_versions: ['17.03.', '18.06.', '18.09.', '19.03.']
 # Nvidia docker options to add in the docker.json file
 docker_nvidia_options:
   default-runtime: nvidia

meta/main.yml

@@ -21,7 +21,6 @@ dependencies:
     when: kube_ntp_servers != []
   - role: 'grycap.docker'
     docker_version: "{{ kube_docker_version | default('19.03.15', true) }}"
-    docker_compatible_versions: "{{kube_docker_compatible_versions}}"
     docker_config_values: "{{ {'exec-opts': ['native.cgroupdriver=systemd'], 'log-driver': 'json-file', 'log-opts': {'max-size': '100m'}, 'storage-driver': 'devicemapper'} | combine(kube_docker_options) }}"
     docker_nvidia_support: '{{ kube_nvidia_support and kube_type_of_node == "wn" }}'
     docker_install_criu: false
@@ -32,7 +31,6 @@ dependencies:
     when: ansible_os_family == "RedHat" and kube_install_method == 'kubeadm' and kube_cri_runtime != 'crio'
   - role: 'grycap.docker'
     docker_version: "{{ kube_docker_version | default('5:19.03.11~3-0~' + (ansible_distribution | lower) + '-' + ansible_distribution_release, true) }}"
-    docker_compatible_versions: "{{kube_docker_compatible_versions}}"
     docker_config_values: "{{ {'exec-opts': ['native.cgroupdriver=systemd'], 'log-driver': 'json-file', 'log-opts': {'max-size': '100m'}, 'storage-driver': 'overlay2'} | combine(kube_docker_options) }}"
     docker_nvidia_support: '{{ kube_nvidia_support and kube_type_of_node == "wn" }}'
     docker_install_criu: false

tasks/cri-dockerd.yaml

@@ -0,0 +1,36 @@
+---
+- name: Download cri-dockerd tarball
+  get_url:
+    url: https://github.com/Mirantis/cri-dockerd/releases/download/v{{ kube_cri_dockerd_version }}/cri-dockerd-v{{ kube_cri_dockerd_version }}-linux-amd64.tar.gz
+    dest: /tmp/cri-dockerd-v{{ kube_cri_dockerd_version }}-linux-amd64.tar.gz
+
+- name: Extract cri-dockerd tarball
+  unarchive:
+    src: /tmp/cri-dockerd-v{{ kube_cri_dockerd_version }}-linux-amd64.tar.gz
+    dest: /tmp
+    remote_src: yes
+
+- name: Copy cri-dockerd binary
+  copy:
+    src: /tmp/cri-dockerd-v{{ kube_cri_dockerd_version }}-linux-amd64/cri-dockerd
+    dest: /usr/bin/cri-dockerd
+    mode: '0755'
+
+- name: Download cri-docker service and socket
+  get_url:
+    url: https://raw.githubusercontent.com/Mirantis/cri-dockerd/master/packaging/systemd/{{ item }}
+    dest: /etc/systemd/system/{{ item }}
+    mode: '0644'
+  loop: 
+    - cri-docker.service
+    - cri-docker.socket
+
+- name: Enable cri-dockerd service
+  systemd:
+    name: "{{ item }}"
+    enabled: yes
+    daemon_reload: yes
+    state: started
+  loop: 
+    - cri-docker.service
+    - cri-docker.socket

tasks/main.yaml

@@ -8,6 +8,10 @@
     regexp: '^([^#].*?\sswap\s+sw.*)$'
     replace: '# \1'
 
+- name: Include cri-docker tasks
+  include_tasks: "cri-docker.yaml"
+  when: kube_cri_runtime == "docker"
+
 - name: Include "{{kube_install_method}}" tasks
   include_tasks: "{{kube_install_method}}.yaml"