From: Fatih Degirmenci <fatih.degirmenci@est.tech>
Date: Mon, 13 Jul 2020 15:18:29 +0000 (+0000)
Subject: Bump kubernetes to v1.18.5
X-Git-Url: https://gerrit.nordix.org/gitweb?p=infra%2Fstack%2Fkubernetes.git;a=commitdiff_plain;h=21fe8dfd96e1231a8d792f4f6e75d237b2bfb3d6;hp=21fe8dfd96e1231a8d792f4f6e75d237b2bfb3d6

Bump kubernetes to v1.18.5

The container image, flannel_cni, is removed in upstream Kubespray
download role so we remove it as well.

Depends-On: Ie8be93ba62dc90229f54bd618c982aeaf4bdaafb
Change-Id: I7bc9f42fd5bb6a29d4dd16d9e56228dde58fd498
---