From 5330917f06d0e923ccdfca9d029bf1c30f1e6a9f Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Wed, 3 Oct 2018 11:12:05 -0700 Subject: Bump kubespray version to 2.7.0 Change-Id: I9d8cd095797804fe96d36b0a08354247096351df Signed-off-by: Victor Morales Issue-ID: MULTICLOUD-301 --- .gitignore | 1 + vagrant/installer.sh | 2 +- vagrant/playbooks/krd-vars.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a9a06af0..b32f4c13 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ src/k8splugin/plugins/**/*.so # KRD .vagrant/ vagrant/inventory/hosts.ini +vagrant/inventory/artifacts vagrant/inventory/group_vars/all.yml vagrant/config/pdf.yml vagrant/sources.list diff --git a/vagrant/installer.sh b/vagrant/installer.sh index dd5b77b6..65c649e1 100755 --- a/vagrant/installer.sh +++ b/vagrant/installer.sh @@ -140,7 +140,7 @@ function install_k8s { # Configure environment mkdir -p $HOME/.kube - mv $HOME/admin.conf $HOME/.kube/config + mv $krd_inventory_folder/artifacts/admin.conf $HOME/.kube/config } # install_addons() - Install Kubenertes AddOns diff --git a/vagrant/playbooks/krd-vars.yml b/vagrant/playbooks/krd-vars.yml index 89aa21db..b259e08d 100644 --- a/vagrant/playbooks/krd-vars.yml +++ b/vagrant/playbooks/krd-vars.yml @@ -47,4 +47,4 @@ nfd_version: 175305b1ad73be7301ac94add475cec6fef797a9 nfd_url: "https://github.com/kubernetes-incubator/node-feature-discovery" go_version: 1.10.3 -kubespray_version: 2.6.0 +kubespray_version: 2.7.0 -- cgit 1.2.3-korg