X-Git-Url: https://gerrit.nordix.org/gitweb?p=infra%2Fstack%2Fkubernetes.git;a=blobdiff_plain;f=vars%2Fkubernetes.yaml;h=f533d2e84177c0b3233e73e89937c4820a927034;hp=75bd857aaea6c82dfe4d30648f6ab2c136c41b10;hb=5878b2263a6c38ac6ca786e663ca3db97fb9ca2c;hpb=d7c1e7673b19be3c8ee33283762aba19a606b6cd

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 75bd857..f533d2e 100644
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -61,19 +61,17 @@ deploy_scenario: "{{ lookup('env', 'DEPLOY_SCENARIO') | default('k8-multus-plugi
 # -------------------------------------------------------------------------------
 # Nordix: Docker version
 # -------------------------------------------------------------------------------
-# NOTE (fdegir): versions of docker as of 13.02.2020 matching to what Kubespray uses
-# Please note that docker-ce version is configured to be overrideable since some scenarios
-# require different docker versions
-docker_ce_version: "{{ lookup('env', 'DOCKER_CE_VERSION') | default('5:18.09.9~3-0~ubuntu-bionic', true) }}"
+# NOTE (fdegir): versions of docker as of 13.07.2020 matching to what Kubespray requires
+docker_ce_version: "5:19.03.12~3-0~ubuntu-bionic"
 docker_ce_cli_version: "{{ docker_ce_version }}"
 docker_registry_version: "2.7.1"
-containerd_io_version: "1.2.6-3"
+containerd_io_version: "1.2.13-2"
 
 # -------------------------------------------------------------------------------
 # Kubernetes: Kubernetes and kubectl versions
 # -------------------------------------------------------------------------------
 # Kubernetes version that is supported by the pinned kubespray version
-kubernetes_version: "v1.17.0"
+kubernetes_version: "v1.18.5"
 # version of the kubectl should generally match to the version of kubernetes itself
 # but it would be good to have possibility to override it in case if someone needs it for some reason
 kubectl_version: "{{ kubernetes_version }}"
@@ -82,6 +80,7 @@ kubectl_version: "{{ kubernetes_version }}"
 # Kubernetes: Versions of rook, ceph and their dependencies
 # -------------------------------------------------------------------------------
 rook_version: "v1.1.2"
+busybox_version: "1.32.0"
 ceph_version: "v14.2.4-20190917"
 cephcsi_version: "v1.2.1"
 csi_node_driver_registrar_version: "v1.1.0"