Bring Kubernetes 1.15

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

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 5accc0140efce8e7a35efd662147af7612389293..e9b86cd0f85af717691569c456f7dfb5bb161cd2 100644 (file)
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -36,32 +36,19 @@ installers:
   kubespray:
     scm: git
     src: https://gerrit.nordix.org/infra/installer/kubespray.git
-    version: "{{ lookup('env', 'NORDIX_KUBESPRAY_VERSION') | default('master', true) }}"
+    version: "{{ lookup('env', 'NORDIX_KUBESPRAY_VERSION') | default('1.15', true) }}"
     refspec: "{{ lookup('env', 'NORDIX_KUBESPRAY_REFSPEC') | default(omit) }}"
 
-# NOTE (fdegir): this is only the list of scenarios implemented within
-# installer repository and does not list what apps are for curated for
-# them as it is self documented within the scenario playbook in installer
-# repository. Curated apps are not listed separately either as they are
-# similar to scenarios; they are available in installer repository.
+# NOTE (fdegir): this is only the list of scenarios supported by this version of the stack
 scenarios:
-  - k8-calico-istio
   - k8-calico-nofeature
-  - k8-calico-spinnaker
-  - k8-canal-nofeature
-  - k8-cilium-nofeature
-  - k8-flannel-nofeature
-  - k8-multus-nofeature
-  - k8-multus-plugins
-  - k8-weave-nofeature
 
 # -------------------------------------------------------------------------------
 # Kubernetes: Kubernetes and kubectl versions
 # -------------------------------------------------------------------------------
 # Kubernetes version that is supported by the pinned kubespray version
-kubernetes_version: "v1.17.0"
+kubernetes_version: "v1.15.9"
 # 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 }}"
 
 # -------------------------------------------------------------------------------