diff options
| -rwxr-xr-x | vagrant/installer.sh | 16 | ||||
| -rwxr-xr-x | vagrant/setup.sh | 6 |
2 files changed, 4 insertions, 18 deletions
diff --git a/vagrant/installer.sh b/vagrant/installer.sh index f6f2f76a..5ac06513 100755 --- a/vagrant/installer.sh +++ b/vagrant/installer.sh @@ -187,20 +187,6 @@ function install_plugin { popd } -# _install_crictl() - Install Container Runtime Interface (CRI) CLI -function _install_crictl { - local version="v1.0.0-alpha.0" # More info: https://github.com/kubernetes-incubator/cri-tools#current-status - - wget https://github.com/kubernetes-incubator/cri-tools/releases/download/$version/crictl-$version-linux-amd64.tar.gz - tar zxvf crictl-$version-linux-amd64.tar.gz -C /usr/local/bin - rm -f crictl-$version-linux-amd64.tar.gz - - cat << EOL > /etc/crictl.yaml -runtime-endpoint: unix:///run/criproxy.sock -image-endpoint: unix:///run/criproxy.sock -EOL -} - # _print_kubernetes_info() - Prints the login Kubernetes information function _print_kubernetes_info { if ! $(kubectl version &>/dev/null); then @@ -219,7 +205,7 @@ function _print_kubernetes_info { } # Configuration values -addons="virtlet ovn-kubernetes multus nfd" +addons="virtlet ovn-kubernetes multus" krd_folder="$(dirname "$0")" verbose="" diff --git a/vagrant/setup.sh b/vagrant/setup.sh index 55c4a487..2c4ece68 100755 --- a/vagrant/setup.sh +++ b/vagrant/setup.sh @@ -11,7 +11,7 @@ set -o nounset set -o pipefail -vagrant_version=2.1.4 +vagrant_version=2.1.5 if ! $(vagrant version &>/dev/null); then enable_vagrant_install=true else @@ -153,8 +153,8 @@ esac if ! which pip; then curl -sL https://bootstrap.pypa.io/get-pip.py | sudo python fi -sudo pip install --upgrade pip -sudo pip install tox +sudo -H pip install --upgrade pip +sudo -H pip install tox ${INSTALLER_CMD} ${packages[@]} if [[ ${http_proxy+x} ]]; then |