From 04934a40e55e57a7c22d9ea0af7f7a7a4595867b Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 28 Jul 2020 09:32:37 +0200 Subject: [PATCH] ci: start minikube with --force to allow running as root When starting minikube as root with --driver=kvm2, minikube complains that this is not the right thing to do. However, in the CentOS CI we really want to run as root, as that makes the scripts simpler. Add the --force option while starting, so that minikube does not abort anymore. Signed-off-by: Niels de Vos --- scripts/minikube.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/minikube.sh b/scripts/minikube.sh index ba1add133..323579dae 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -139,16 +139,16 @@ up) if minikube_supports_psp; then enable_psp # shellcheck disable=SC2086 - minikube start --memory="${MEMORY}" -b kubeadm --kubernetes-version="${KUBE_VERSION}" --vm-driver="${VM_DRIVER}" --feature-gates="${K8S_FEATURE_GATES}" ${EXTRA_CONFIG} + minikube start --force --memory="${MEMORY}" -b kubeadm --kubernetes-version="${KUBE_VERSION}" --vm-driver="${VM_DRIVER}" --feature-gates="${K8S_FEATURE_GATES}" ${EXTRA_CONFIG} else # This is a workaround to fix psp issues in minikube >1.6.2 and <1.11.0 # shellcheck disable=SC2086 - minikube start --memory="${MEMORY}" -b kubeadm --kubernetes-version="${KUBE_VERSION}" --vm-driver="${VM_DRIVER}" --feature-gates="${K8S_FEATURE_GATES}" + 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 stop # shellcheck disable=SC2086 - minikube start --memory="${MEMORY}" -b kubeadm --kubernetes-version="${KUBE_VERSION}" --vm-driver="${VM_DRIVER}" --feature-gates="${K8S_FEATURE_GATES}" ${EXTRA_CONFIG} + minikube start --force --memory="${MEMORY}" -b kubeadm --kubernetes-version="${KUBE_VERSION}" --vm-driver="${VM_DRIVER}" --feature-gates="${K8S_FEATURE_GATES}" ${EXTRA_CONFIG} fi # create a link so the default dataDirHostPath will work for this