diff options
| author |  Yong Tang <yongtang@users.noreply.github.com>
| 2016-09-27 07:57:04 +0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-09-27 07:57:04 +0800 |
| commit | 9b6b8d276269cb1a36b7f78da4caa51106dff0ed (patch) | |
| tree | 2ba905478ae0d5cb49ff9c57b4eb476a5affbbab /contrib | |
| parent | 77947fd51afd10d339842211a56cab0706ee0358 (diff) | |
| download | coredns-9b6b8d276269cb1a36b7f78da4caa51106dff0ed.tar.gz coredns-9b6b8d276269cb1a36b7f78da4caa51106dff0ed.tar.zst coredns-9b6b8d276269cb1a36b7f78da4caa51106dff0ed.zip | |
Cleanup Makefile and .travis.yml (#305)
This fix updates .travis.yml and Makefile for several places:
- Remove unneeded `docker pull gcr.io/google_containers/hyperkube-amd64:v1.2.4` (only v1.3.7 was used)
- Use docker to deploy etcd (insteadof downloading etcd binary).
- Merge `make testk8s` and `make testk8s-setup` (no need to have multiple targets for a couple of tests)
- Set version of etcd and kubernetes in .travis.yml (so that it is easy to update new version in the future)
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/kubernetes/testscripts/00_run_k8s.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/kubernetes/testscripts/00_run_k8s.sh b/contrib/kubernetes/testscripts/00_run_k8s.sh index 7ff6811ce..094f7d5d0 100755 --- a/contrib/kubernetes/testscripts/00_run_k8s.sh +++ b/contrib/kubernetes/testscripts/00_run_k8s.sh @@ -5,7 +5,7 @@ set -e # Based on instructions at: http://kubernetes.io/docs/getting-started-guides/docker/ #K8S_VERSION=$(curl -sS https://storage.googleapis.com/kubernetes-release/release/latest.txt) -K8S_VERSION="v1.3.7" +K8S_VERSION=${K8S_VERSION:-"1.3.7"} ARCH="amd64" @@ -32,7 +32,7 @@ docker run -d \ --net=host \ --pid=host \ --privileged \ - gcr.io/google_containers/hyperkube-${ARCH}:${K8S_VERSION} \ + gcr.io/google_containers/hyperkube-${ARCH}:v${K8S_VERSION} \ /hyperkube kubelet \ --containerized \ --hostname-override=127.0.0.1 \ |