From bef1e628ac119f3f24b563307e7471cb4a9c5762 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Wed, 7 Apr 2021 17:33:53 +0200
Subject: [PATCH] Fix issue with 'latest' in containerd version (#7459)

---
 roles/kubernetes/preinstall/tasks/0020-verify-settings.yml | 1 +
 tests/files/packet_fedora32-kube-ovn-containerd.yml        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
index 84824182d..594d7e459 100644
--- a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
+++ b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
@@ -305,6 +305,7 @@
     msg: "containerd_version is too low. Minimum version {{ containerd_min_version_required }}"
   run_once: yes
   when:
+    - containerd_version != 'latest'
     - container_manager == 'containerd'
 
 - name: Stop if using deprecated containerd_config variable
diff --git a/tests/files/packet_fedora32-kube-ovn-containerd.yml b/tests/files/packet_fedora32-kube-ovn-containerd.yml
index 643644195..4df71c1c4 100644
--- a/tests/files/packet_fedora32-kube-ovn-containerd.yml
+++ b/tests/files/packet_fedora32-kube-ovn-containerd.yml
@@ -5,6 +5,7 @@ mode: default
 
 # Kubespray settings
 container_manager: containerd
+containerd_version: latest
 etcd_deployment_type: host
 deploy_netchecker: true
 dns_min_replicas: 1