update to use e2e-up.sh instead of kubetest

This commit is contained in:
Yang Lu 2019-12-19 20:03:49 -08:00
parent b4f5238535
commit b88788b085

View File

@ -56,9 +56,8 @@ make quick-release
### 2. Create a Kubernetes cluster ### 2. Create a Kubernetes cluster
You can create a regular Kubernetes cluster or an end-to-end test cluster. You can create a regular Kubernetes cluster or an end-to-end test cluster.<br />
End-to-end test clusters support running the Kubernetes e2e tests and enable Only end-to-end test clusters support running the Kubernetes e2e tests (as both [e2e cluster creation](https://github.com/kubernetes/kubernetes/blob/b632eaddbaad9dc1430d214d506b72750bbb9f69/hack/e2e-internal/e2e-up.sh#L24) and [e2e test scripts](https://github.com/kubernetes/kubernetes/blob/b632eaddbaad9dc1430d214d506b72750bbb9f69/hack/ginkgo-e2e.sh#L42) are setup based on `cluster/gce/config-test.sh`), also enables some debugging features such as SSH access on the Windows nodes.
some debugging features such as SSH access on the Windows nodes.
Please make sure you set the environment variables properly following the Please make sure you set the environment variables properly following the
instructions in the previous section. instructions in the previous section.
@ -96,39 +95,17 @@ PROJECT=${CLOUDSDK_CORE_PROJECT} KUBERNETES_SKIP_CONFIRM=y ./cluster/kube-down.s
``` ```
#### 2b. Create a Kubernetes end-to-end (E2E) test cluster #### 2b. Create a Kubernetes end-to-end (E2E) test cluster
Install or update `kubetest` as follows:
```
go get -u k8s.io/test-infra/kubetest
```
* If you see the error below, it's due to `github.com/Azure/go-autorest` dependencies are incompatible between different versions of go modules:
```
build k8s.io/test-infra/kubetest: cannot load github.com/Azure/go-autorest/autorest: ambiguous import: found github.com/Azure/go-autorest/autorest in multiple modules:
github.com/Azure/go-autorest v11.1.2+incompatible (/usr/local/google/home/yluu/go/pkg/mod/github.com/!azure/go-autorest@v11.1.2+incompatible/autorest)
github.com/Azure/go-autorest/autorest v0.9.0 (/usr/local/google/home/yluu/go/pkg/mod/github.com/!azure/go-autorest/autorest@v0.9.0)
```
Add `github.com/Azure/go-autorest v12.2.0+incompatible` into require block of `go.mod` and try again.
If you have built your own release binaries following step 1, run the following If you have built your own release binaries following step 1, run the following
command: command:
``` ```
PROJECT=${CLOUDSDK_CORE_PROJECT} $GOPATH/bin/kubetest --up PROJECT=${CLOUDSDK_CORE_PROJECT} ./hack/e2e-internal/e2e-up.sh
``` ```
Otherwise, you can specify what branch from which to get the release artifacts: If any e2e cluster exists already, this command will prompt you whether tears down and creates a new one. To teardown existing e2e cluster only, run the command:
``` ```
# Get the latest build from the stable1 branch PROJECT=${CLOUDSDK_CORE_PROJECT} ./hack/e2e-internal/e2e-down.sh
PROJECT=${CLOUDSDK_CORE_PROJECT} $GOPATH/bin/kubetest --up --extract=ci/k8s-stable1
# Or Get the latest build from master
PROJECT=${CLOUDSDK_CORE_PROJECT} $GOPATH/bin/kubetest --up --extract=ci-cross/latest
``` ```
This command, by default, tears down any existing E2E cluster and creates a new
one. To teardown the cluster run the same command with `--down` instead of
`--up`.
No matter what type of cluster you chose to create, the result should be a No matter what type of cluster you chose to create, the result should be a
Kubernetes cluster with one Linux master node, `NUM_NODES` Linux worker nodes Kubernetes cluster with one Linux master node, `NUM_NODES` Linux worker nodes
and `NUM_WINDOWS_NODES` Windows worker nodes. and `NUM_WINDOWS_NODES` Windows worker nodes.