diff --git a/hack/e2e-internal/e2e-down.sh b/hack/e2e-internal/e2e-down.sh index 62ee7aec2..852d543bb 100755 --- a/hack/e2e-internal/e2e-down.sh +++ b/hack/e2e-internal/e2e-down.sh @@ -2,13 +2,8 @@ [[ $DEBUG ]] && set -x -set -eof pipefail - # include env . hack/e2e-internal/e2e-env.sh -echo "Destroying running docker containers..." -# do not failt if the container is not running -docker rm -f kubelet || true -docker rm -f apiserver || true -docker rm -f etcd || true +echo "Destroying running e2e cluster..." +${MINIKUBE} --profile ingress-e2e delete || echo "e2e cluster already destroyed" diff --git a/hack/e2e-internal/e2e-env.sh b/hack/e2e-internal/e2e-env.sh index d0747bb6e..0445f0bd7 100755 --- a/hack/e2e-internal/e2e-env.sh +++ b/hack/e2e-internal/e2e-env.sh @@ -2,20 +2,23 @@ [[ $DEBUG ]] && set -x -export ETCD_VERSION=3.0.14 -export K8S_VERSION=1.4.5 +export MINIKUBE_VERSION=0.19.1 +export K8S_VERSION=v1.6.4 export PWD=`pwd` export BASEDIR="$(dirname ${BASH_SOURCE})" export KUBECTL="${BASEDIR}/kubectl" +export MINIKUBE="${BASEDIR}/minikube" export GOOS="${GOOS:-linux}" if [ ! -e ${KUBECTL} ]; then echo "kubectl binary is missing. downloading..." - curl -sSL http://storage.googleapis.com/kubernetes-release/release/v${K8S_VERSION}/bin/${GOOS}/amd64/kubectl -o ${KUBECTL} + curl -sSL http://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/${GOOS}/amd64/kubectl -o ${KUBECTL} chmod u+x ${KUBECTL} fi -${KUBECTL} config set-cluster travis --server=http://0.0.0.0:8080 -${KUBECTL} config set-context travis --cluster=travis -${KUBECTL} config use-context travis +if [ ! -e ${MINIKUBE} ]; then + echo "kubectl binary is missing. downloading..." + curl -sSLo ${MINIKUBE} https://storage.googleapis.com/minikube/releases/v${MINIKUBE_VERSION}/minikube-linux-amd64 + chmod +x ${MINIKUBE} +fi diff --git a/hack/e2e-internal/e2e-up.sh b/hack/e2e-internal/e2e-up.sh index 15b2d4631..c5f27510c 100755 --- a/hack/e2e-internal/e2e-up.sh +++ b/hack/e2e-internal/e2e-up.sh @@ -7,49 +7,7 @@ set -eof pipefail # include env . hack/e2e-internal/e2e-env.sh -echo "Starting etcd..." -docker run -d \ - --net=host \ - --name=etcd \ - quay.io/coreos/etcd:v$ETCD_VERSION - -echo "Starting kubernetes..." - -docker run -d --name=apiserver \ - --net=host \ - --pid=host \ - --privileged=true \ - gcr.io/google_containers/hyperkube:v${K8S_VERSION} \ - /hyperkube apiserver \ - --insecure-bind-address=0.0.0.0 \ - --service-cluster-ip-range=10.0.0.1/24 \ - --etcd_servers=http://127.0.0.1:4001 \ - --v=2 - -docker run -d --name=kubelet \ - --volume=/:/rootfs:ro \ - --volume=/sys:/sys:ro \ - --volume=/dev:/dev \ - --volume=/var/lib/docker/:/var/lib/docker:rw \ - --volume=/var/lib/kubelet/:/var/lib/kubelet:rw \ - --volume=/var/run:/var/run:rw \ - --net=host \ - --pid=host \ - --privileged=true \ - gcr.io/google_containers/hyperkube:v${K8S_VERSION} \ - /hyperkube kubelet \ - --containerized \ - --hostname-override="0.0.0.0" \ - --address="0.0.0.0" \ - --cluster_dns=10.0.0.10 --cluster_domain=cluster.local \ - --api-servers=http://localhost:8080 \ - --config=/etc/kubernetes/manifests-multi - -echo "waiting until api server is available..." -until curl -o /dev/null -sIf http://0.0.0.0:8080; do \ - sleep 10; -done; +${MINIKUBE} --profile ingress-e2e start +${MINIKUBE} --profile ingress-e2e status echo "Kubernetes started" -echo "Kubernetes information:" -${KUBECTL} version