Add k8-calico-dualstack and k8-multus-dualstack scenarios

[infra/stack/kubernetes.git] / vars / kubernetes.yaml

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 905bb358f3b1b4de2dbaae89a50d2de0ebd941d8..2023452dc14f957db935fcf5156e7790a04b6ce0 100644 (file)
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -45,32 +45,35 @@ installers:
 # repository. Curated apps are not listed separately either as they are
 # similar to scenarios; they are available in installer repository.
 scenarios:
+  - k8-calico-dualstack
   - k8-calico-istio
   - k8-calico-nofeature
   - k8-calico-spinnaker
   - k8-canal-nofeature
   - k8-cilium-nofeature
   - k8-flannel-nofeature
+  - k8-multus-dualstack
   - k8-multus-nofeature
   - 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 +82,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"
@@ -106,7 +110,7 @@ spinnaker_app_version: "1.16.2"
 # -------------------------------------------------------------------------------
 # Kubernetes: App versions
 # -------------------------------------------------------------------------------
-helm_version: "v2.16.1"
+helm_version: "v3.5.0"
 charts_version: "0b64349aeb537d0fd038df0e1d40ec5cf1206609"
 istio_version: "1.3.1"