aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xvagrant/installer.sh1
-rw-r--r--vagrant/inventory/group_vars/k8s-cluster.yml2
-rw-r--r--vagrant/playbooks/krd-vars.yml14
3 files changed, 9 insertions, 8 deletions
diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index f1109073..e8ed9f11 100755
--- a/vagrant/installer.sh
+++ b/vagrant/installer.sh
@@ -111,6 +111,7 @@ function install_k8s {
else
echo "kube_log_level: 2" | tee $krd_inventory_folder/group_vars/all.yml
fi
+ echo "kubeadm_enabled: true" | tee --append $krd_inventory_folder/group_vars/all.yml
if [[ -n "${http_proxy}" ]]; then
echo "http_proxy: \"$http_proxy\"" | tee --append $krd_inventory_folder/group_vars/all.yml
fi
diff --git a/vagrant/inventory/group_vars/k8s-cluster.yml b/vagrant/inventory/group_vars/k8s-cluster.yml
index 8263c063..ab0c89ec 100644
--- a/vagrant/inventory/group_vars/k8s-cluster.yml
+++ b/vagrant/inventory/group_vars/k8s-cluster.yml
@@ -57,7 +57,7 @@ kubeconfig_localhost: true
local_volumes_enabled: true
## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.11.3
+kube_version: v1.12.3
# Helm deployment
helm_enabled: true
diff --git a/vagrant/playbooks/krd-vars.yml b/vagrant/playbooks/krd-vars.yml
index 48ae5284..0269b9bb 100644
--- a/vagrant/playbooks/krd-vars.yml
+++ b/vagrant/playbooks/krd-vars.yml
@@ -11,12 +11,12 @@
base_dest: /tmp
multus_dest: "{{ base_dest }}/multus-cni"
-multus_source_type: "tarball"
-multus_version: 3.1
-multus_url: "https://github.com/intel/multus-cni/releases/download/v{{ multus_version }}/multus-cni_v{{ multus_version }}_linux_amd64.tar.gz"
-#multus_source_type: "source"
-#multus_version: def72938cd2fb272eb3a6f64a8162b1049404357
-#multus_url: "https://github.com/intel/multus-cni"
+#multus_source_type: "tarball"
+#multus_version: 3.1
+#multus_url: "https://github.com/intel/multus-cni/releases/download/v{{ multus_version }}/multus-cni_v{{ multus_version }}_linux_amd64.tar.gz"
+multus_source_type: "source"
+multus_version: 366f2120cb88c85deab6343b7062fd38fdb0ece9
+multus_url: "https://github.com/ritusood/multus-cni"
ovn_kubernetes_dest: "{{ base_dest }}/ovn-kubernetes"
ovn_kubernetes_source_type: "tarball"
@@ -52,6 +52,6 @@ istio_version: 1.0.3
istio_url: "https://github.com/istio/istio/releases/download/{{ istio_version }}/istio-{{ istio_version }}-linux.tar.gz"
go_version: '1.11'
-kubespray_version: 2.7.0
+kubespray_version: 2.8.0
kubectl_version: 1.11.2
helm_client_version: 2.9.1