Bypass version check for localkube file URI
parent
a2a4780186
commit
c20ebde431
|
@ -83,7 +83,7 @@ find ~/.minikube || true
|
||||||
|
|
||||||
# Allow this to fail, we'll switch on the return code below.
|
# Allow this to fail, we'll switch on the return code below.
|
||||||
set +e
|
set +e
|
||||||
${SUDO_PREFIX}out/e2e-${OS_ARCH} -minikube-start-args="--vm-driver=${VM_DRIVER}" -minikube-args="--v=10 --logtostderr ${EXTRA_ARGS}" -test.v -test.timeout=30m -binary=out/minikube-${OS_ARCH}
|
${SUDO_PREFIX}out/e2e-${OS_ARCH} -minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" -minikube-args="--v=10 --logtostderr ${EXTRA_ARGS}" -test.v -test.timeout=30m -binary=out/minikube-${OS_ARCH}
|
||||||
result=$?
|
result=$?
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,8 @@ set -e
|
||||||
OS_ARCH="linux-amd64"
|
OS_ARCH="linux-amd64"
|
||||||
VM_DRIVER="kvm2"
|
VM_DRIVER="kvm2"
|
||||||
JOB_NAME="Linux-KVM-Alt"
|
JOB_NAME="Linux-KVM-Alt"
|
||||||
|
EXTRA_ARGS="--bootstrapper=localkube"
|
||||||
|
EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
|
||||||
|
|
||||||
# Download files and set permissions
|
# Download files and set permissions
|
||||||
source common.sh
|
source common.sh
|
||||||
|
|
|
@ -21,6 +21,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"k8s.io/minikube/pkg/minikube/constants"
|
"k8s.io/minikube/pkg/minikube/constants"
|
||||||
|
|
||||||
|
@ -80,6 +81,9 @@ func GetK8sVersionsFromURL(url string) (K8sReleases, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsValidLocalkubeVersion(v string, url string) (bool, error) {
|
func IsValidLocalkubeVersion(v string, url string) (bool, error) {
|
||||||
|
if strings.HasPrefix(v, "file://") {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
k8sReleases, err := GetK8sVersionsFromURL(url)
|
k8sReleases, err := GetK8sVersionsFromURL(url)
|
||||||
glog.Infoln(k8sReleases)
|
glog.Infoln(k8sReleases)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue