From a44035888eab8dd7a4e7a7a81dfc7a2f0cc19c7a Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Tue, 25 Aug 2020 21:45:50 +0530 Subject: [PATCH] ci: update minikube only when latest is asked Fixes: #1431 Signed-off-by: Prasanna Kumar Kalever --- scripts/minikube.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 3121fe66a..d15b34b1b 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -50,26 +50,26 @@ function detect_minikube() { # install minikube function install_minikube() { - local mku_version latest_version - mku_version=$(${minikube} update-check 2> /dev/null | grep "LatestVersion" || true) - latest_version=$(echo "${mku_version}" | cut -d' ' -f2) - if [[ -z "${latest_version}" ]]; then - # skip: update-check failed for some reason, lets continue with what we have - latest_version=${MINIKUBE_VERSION} + if [[ "${MINIKUBE_VERSION}" == "latest" ]]; then + local mku_version + mku_version=$(${minikube} update-check 2> /dev/null | grep "LatestVersion" || true) + if [[ -n "${mku_version}" ]]; then + MINIKUBE_VERSION=$(echo "${mku_version}" | cut -d' ' -f2) + fi fi + if type "${minikube}" >/dev/null 2>&1; then local mk_version version read -ra mk_version <<<"$(${minikube} version)" version=${mk_version[2]} - echo "minikube already installed with ${version}" - if [[ "${version}" == "${latest_version}" ]]; then - echo "minikube is already the latest version" + if [[ "${version}" == "${MINIKUBE_VERSION}" ]]; then + echo "minikube already installed with ${version}" return fi fi - echo "Installing minikube. Version: ${latest_version}" - curl -Lo minikube https://storage.googleapis.com/minikube/releases/"${latest_version}"/minikube-linux-"${MINIKUBE_ARCH}" && chmod +x minikube && mv minikube /usr/local/bin/ + echo "Installing minikube. Version: ${MINIKUBE_VERSION}" + curl -Lo minikube https://storage.googleapis.com/minikube/releases/"${MINIKUBE_VERSION}"/minikube-linux-"${MINIKUBE_ARCH}" && chmod +x minikube && mv minikube /usr/local/bin/ } function detect_kubectl() {