X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=vars%2Fkubernetes.yaml;h=f533d2e84177c0b3233e73e89937c4820a927034;hb=59b8d3db83f0dbeb41ebac7a1ad076797cc6d100;hp=905bb358f3b1b4de2dbaae89a50d2de0ebd941d8;hpb=bfdd3d8ef9d2aa002bab69ebd36f971df3918146;p=infra%2Fstack%2Fkubernetes.git

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 905bb35..f533d2e 100644
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -55,22 +55,23 @@ scenarios:
   - k8-multus-plugins
   - k8-weave-nofeature
 
+# NOTE (fdegir): set default deploy scenario for the stack
+deploy_scenario: "{{ lookup('env', 'DEPLOY_SCENARIO') | default('k8-multus-plugins', true) }}"
+
 # -------------------------------------------------------------------------------
 # 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 }}"
@@ -79,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"