From ec01b40e855fa56a92e96785eca05eb284c04bf7 Mon Sep 17 00:00:00 2001
From: Calin Cristian Andrei <cristian.calin@outlook.com>
Date: Fri, 10 Jun 2022 14:24:18 +0300
Subject: [PATCH] [cri_dockerd] upgrade cri_dockerd to 0.2.2 for 1.24
 compatibility

* use new artifact release name
* enable cri-dockerd dual setack support if enable_dual_stack_networks
---
 .../cri-dockerd/templates/cri-dockerd.service.j2 |  3 ++-
 roles/download/defaults/main.yml                 | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/roles/container-engine/cri-dockerd/templates/cri-dockerd.service.j2 b/roles/container-engine/cri-dockerd/templates/cri-dockerd.service.j2
index 247f5ad4d..968c7b0ac 100644
--- a/roles/container-engine/cri-dockerd/templates/cri-dockerd.service.j2
+++ b/roles/container-engine/cri-dockerd/templates/cri-dockerd.service.j2
@@ -7,7 +7,8 @@ Requires=cri-dockerd.socket
 
 [Service]
 Type=notify
-ExecStart={{ bin_dir }}/cri-dockerd --container-runtime-endpoint fd:// --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin --network-plugin=cni --pod-cidr={{ kube_pods_subnet }}
+ExecStart={{ bin_dir }}/cri-dockerd --container-runtime-endpoint {{ cri_socket }} --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin --network-plugin=cni --pod-cidr={{ kube_pods_subnet }} {% if enable_dual_stack_networks %}--ipv6-dual-stack=True{% endif %}
+
 ExecReload=/bin/kill -s HUP $MAINPID
 TimeoutSec=0
 RestartSec=2
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 576fc5c1e..b7ddc03cb 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -75,7 +75,7 @@ kata_containers_version: 2.4.1
 youki_version: 0.0.1
 gvisor_version: 20210921
 containerd_version: 1.6.4
-cri_dockerd_version: v0.2.0
+cri_dockerd_version: 0.2.2
 
 # this is relevant when container_manager == 'docker'
 docker_containerd_version: 1.6.4
@@ -155,7 +155,7 @@ gvisor_containerd_shim_runsc_download_url: "https://storage.googleapis.com/gviso
 nerdctl_download_url: "https://github.com/containerd/nerdctl/releases/download/v{{ nerdctl_version }}/nerdctl-{{ nerdctl_version }}-{{ ansible_system | lower }}-{{ image_arch }}.tar.gz"
 krew_download_url: "https://github.com/kubernetes-sigs/krew/releases/download/{{ krew_version }}/krew-{{ host_os }}_{{ image_arch }}.tar.gz"
 containerd_download_url: "https://github.com/containerd/containerd/releases/download/v{{ containerd_version }}/containerd-{{ containerd_version }}-linux-{{ image_arch }}.tar.gz"
-cri_dockerd_download_url: "https://github.com/Mirantis/cri-dockerd/releases/download/{{ cri_dockerd_version }}/cri-dockerd-{{ cri_dockerd_version }}-linux-{{ image_arch }}.tar.gz"
+cri_dockerd_download_url: "https://github.com/Mirantis/cri-dockerd/releases/download/v{{ cri_dockerd_version }}/cri-dockerd-{{ cri_dockerd_version }}.{{ image_arch }}.tgz"
 
 crictl_checksums:
   arm:
@@ -546,13 +546,13 @@ helm_archive_checksums:
 
 cri_dockerd_archive_checksums:
   arm:
-    v0.2.0: 0
+    0.2.2: 0
   arm64:
-    v0.2.0: 6ddcb77bc7ca9d93008fdcb81659e3acfb45105dc935782030afb7dab4a3250b
+    0.2.2: 30e5fb2f06bd1e9fff6eddc185356cf3636d36c6c310bbd5892141e2b8e86ee3
   amd64:
-    v0.2.0: ad0e5f2ac6e7a57af4b560d1638ee26baab68c56a49ff3337e10ff9cea0a3539
+    0.2.2: fbf0fe66805e0104841d0093c6ad74a5e39264616855d902a97c1ba7830855e1
   ppc64le:
-    v0.2.0: 0
+    0.2.2: 0
 
 runc_checksums:
   arm:
@@ -1016,10 +1016,12 @@ downloads:
     file: true
     enabled: "{{ cri_dockerd_enabled }}"
     version: "{{ cri_dockerd_version }}"
-    dest: "{{ local_release_dir }}/cri-dockerd-{{ crictl_version }}-linux-{{ image_arch }}.tar.gz"
+    dest: "{{ local_release_dir }}/cri-dockerd-{{ cri_dockerd_version }}.{{ image_arch }}.tar.gz"
     sha256: "{{ cri_dockerd_archive_checksum }}"
     url: "{{ cri_dockerd_download_url }}"
     unarchive: true
+    unarchive_extra_opts:
+    - --strip=1
     owner: "root"
     mode: "0755"
     groups: