diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-10-23 11:02:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 11:02:22 -0700 |
| commit | 55a336575752fe45979dab82dd5ebdc0636ff05c (patch) | |
| tree | b31262ad87c3ba421357ed5617a9d6547cb98365 | |
| parent | c3516b15302936570756ba4862506a24b168cc65 (diff) | |
| parent | 85d83f654b06a480523b3f6802f06d5a3d2c1c49 (diff) | |
Merge pull request #1257 from yuexiao-wang/update-go
Automatic merge from submit-queue.
Correct the upgrading Go version for e2e image and test image
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
It is incorrect to upgrade Go version for e2e image and test image in development.md
| -rw-r--r-- | contributors/devel/development.md | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contributors/devel/development.md b/contributors/devel/development.md index 0124eacd..8d217bf6 100644 --- a/contributors/devel/development.md +++ b/contributors/devel/development.md @@ -146,9 +146,8 @@ images. - The image for cross compiling in [build/build-image/cross]. The `VERSION` file and `Dockerfile`. -- Update [dockerized-e2e-runner.sh] to run a kubekins-e2e with the desired Go - version. This requires pushing the [e2e][e2e-image] and [test][test-image] - images that are `FROM` the desired Go version. +- Update the desired Go version in Dockerfile for the [e2e][e2e-image] and [test][test-image]. + This requires pushing the [e2e][e2e-image] and [test][test-image] images that are `FROM` the desired Go version. - The cross tag `KUBE_BUILD_IMAGE_CROSS_TAG` in [build/common.sh]. @@ -404,7 +403,6 @@ masse. This makes reviews easier. [OS X GNU tools]: https://www.topbug.net/blog/2013/04/14/install-and-use-gnu-command-line-tools-in-mac-os-x [build/build-image/cross]: https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross [build/common.sh]: https://github.com/kubernetes/kubernetes/blob/master/build/common.sh -[dockerized-e2e-runner.sh]: https://github.com/kubernetes/test-infra/blob/master/jenkins/dockerized-e2e-runner.sh [e2e-image]: https://github.com/kubernetes/test-infra/tree/master/jenkins/e2e-image [etcd-latest]: https://coreos.com/etcd/docs/latest [etcd-install]: testing.md#install-etcd-dependency |