Adding mcord branch: using kubespray master and specific calico/sctp options
Change-Id: Ifed0c1ff84398c53e29e285f34b4f910846e775f
diff --git a/kubespray-installer/k8s-configs.yaml b/kubespray-installer/k8s-configs.yaml
index ec54b02..9834363 100644
--- a/kubespray-installer/k8s-configs.yaml
+++ b/kubespray-installer/k8s-configs.yaml
@@ -29,9 +29,11 @@
- 'ansible_python_interpreter: /usr/bin/python2.7'
- 'ansible_user: {{ kubespray_remote_ssh_user }}'
- 'ansible_become: true'
- - 'kube_feature_gates: []'
+ - 'kube_feature_gates: [SCTPSupport=true]'
- 'kube_network_plugin: calico'
- 'kube_network_plugin_multus: true'
+ - 'calico_version: v3.4.0'
+ - 'calico_cni_version: v3.4.0'
# Edit k8s-cluster.yml variable file
- name: Set Docker DNS servers strict to false
diff --git a/kubespray-installer/setup.sh b/kubespray-installer/setup.sh
index ff946b2..51ad780 100755
--- a/kubespray-installer/setup.sh
+++ b/kubespray-installer/setup.sh
@@ -20,7 +20,7 @@
set -e -o pipefail
-KS_COMMIT="${KS_COMMIT:-v2.8.1}"
+KS_COMMIT="${KS_COMMIT:-master}"
install_kubespray () {
# Cleanup Old Kubespray Installations