From f46fb133577c01f0140e1a67c5c2522b830c4130 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 28 Jul 2020 10:35:18 +0200 Subject: [PATCH] ci: run "kubectl cluster-info" through minikube In case kubectl did not get installed (VM_DRIVER != none), scripts/minikube.sh can fail when kubectl is not in the path. By running the "kubectl cluster-info" command through minikube, the script will succeed. Signed-off-by: Niels de Vos --- scripts/minikube.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 58b7c9562..c77dbb174 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -158,7 +158,7 @@ up) # shellcheck disable=SC2086 ${minikube} start --force --memory="${MEMORY}" -b kubeadm --kubernetes-version="${KUBE_VERSION}" --vm-driver="${VM_DRIVER}" --feature-gates="${K8S_FEATURE_GATES}" DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" - kubectl apply -f "$DIR"/psp.yaml + ${minikube} kubectl -- apply -f "$DIR"/psp.yaml ${minikube} stop # shellcheck disable=SC2086 ${minikube} start --force --memory="${MEMORY}" -b kubeadm --kubernetes-version="${KUBE_VERSION}" --vm-driver="${VM_DRIVER}" --feature-gates="${K8S_FEATURE_GATES}" ${EXTRA_CONFIG} @@ -171,7 +171,7 @@ up) # shellcheck disable=SC2086 ${minikube} ssh "sudo mkdir -p /mnt/${DISK}/var/lib/rook;sudo ln -s /mnt/${DISK}/var/lib/rook /var/lib/rook" fi - kubectl cluster-info + ${minikube} kubectl -- cluster-info ;; down) ${minikube} stop