From 8d39566ba05394f92d4fb4da0fcf144a3d1a4d2a Mon Sep 17 00:00:00 2001 From: Desislava Asenova <9128192+desislavaa@users.noreply.github.com> Date: Fri, 18 Jun 2021 11:52:44 +0300 Subject: [PATCH] Use minikube context for local installation (#1904) * Add explicit context setting for kubectl * Extract function * Prettify --- installation/cmd/run.sh | 2 ++ installation/scripts/install-kyma.sh | 1 + installation/scripts/run-compass-installer.sh | 5 +++-- installation/scripts/utils.sh | 16 +++++++++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/installation/cmd/run.sh b/installation/cmd/run.sh index 55d1cbad65..10de19ebcd 100755 --- a/installation/cmd/run.sh +++ b/installation/cmd/run.sh @@ -124,6 +124,8 @@ if [[ ! ${SKIP_MINIKUBE_START} ]]; then fi fi +useMinikube + echo "Label Minikube node for benchmark execution..." NODE=$(kubectl get nodes | tail -n 1 | cut -d ' ' -f 1) kubectl label node "$NODE" benchmark=true || true diff --git a/installation/scripts/install-kyma.sh b/installation/scripts/install-kyma.sh index 7e0ca1d5f4..8426fcaba7 100755 --- a/installation/scripts/install-kyma.sh +++ b/installation/scripts/install-kyma.sh @@ -9,6 +9,7 @@ LOCAL_ENV=${LOCAL_ENV:-false} CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) SCRIPTS_DIR="${CURRENT_DIR}/../scripts" source $SCRIPTS_DIR/utils.sh +useMinikube POSITIONAL=() while [[ $# -gt 0 ]] diff --git a/installation/scripts/run-compass-installer.sh b/installation/scripts/run-compass-installer.sh index 9ce44f8f83..df7aeb9e68 100755 --- a/installation/scripts/run-compass-installer.sh +++ b/installation/scripts/run-compass-installer.sh @@ -4,6 +4,9 @@ set -o errexit CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SCRIPTS_DIR="${CURRENT_DIR}/../scripts" +source $CURRENT_DIR/utils.sh +useMinikube + DOMAIN="kyma.local" VM_DRIVER="virtualbox" @@ -11,8 +14,6 @@ if [ `uname -s` = "Darwin" ]; then VM_DRIVER="hyperkit" fi -source $CURRENT_DIR/utils.sh - POSITIONAL=() while [[ $# -gt 0 ]] do diff --git a/installation/scripts/utils.sh b/installation/scripts/utils.sh index d3b141e153..f360bb0d25 100755 --- a/installation/scripts/utils.sh +++ b/installation/scripts/utils.sh @@ -107,4 +107,18 @@ function checkInputParameterValue() { echo "Make sure parameter value is neither empty nor start with two hyphens" exit 1 fi -} \ No newline at end of file +} + +function useMinikube() { + CURRENT_CONTEXT=$(kubectl config current-context) + if [ $CURRENT_CONTEXT != "minikube" ]; then + echo "Current context is not minikube, switching to minikube..." + minikube update-context + if [ $? -ne 0 ]; then + echo "Failed to update context to minikube. Local installation requires minikube running" + return 1 + fi + fi + + echo "Using minikube kubectl context" +}