Fix review comments - luxas, ixdy

19ca6ca9 · Manjunath A Kumatagi · 60778cda · 19ca6ca9 · 19ca6ca9 · 60778cda
Commit 19ca6ca9 authored Jun 30, 2017 by Manjunath A Kumatagi
80 changed files
--- a/test/images/BUILD
+++ b/test/images/BUILD
@@ -23,17 +23,17 @@ filegroup(
        "//test/images/fakegitserver:all-srcs",
        "//test/images/goproxy:all-srcs",
        "//test/images/logs-generator:all-srcs",
-        "//test/images/mount-tester:all-srcs",
+        "//test/images/mounttest:all-srcs",
        "//test/images/n-way-http:all-srcs",
        "//test/images/net:all-srcs",
        "//test/images/netexec:all-srcs",
-        "//test/images/network-tester:all-srcs",
+        "//test/images/nettest:all-srcs",
        "//test/images/no-snat-test:all-srcs",
        "//test/images/no-snat-test-proxy:all-srcs",
        "//test/images/port-forward-tester:all-srcs",
        "//test/images/porter:all-srcs",
        "//test/images/resource-consumer:all-srcs",
-        "//test/images/serve_hostname:all-srcs",
+        "//test/images/serve-hostname:all-srcs",
    ],
    tags = ["automanaged"],
 )
--- a/test/images/Makefile
+++ b/test/images/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-REGISTRY ?= gcr.io/k8s-e2e-images
+REGISTRY ?= gcr.io/kubernetes-e2e-test-images
 GOARM=7
 QEMUVERSION=v2.7.0
 GOLANG_VERSION=1.8.3

--- a/test/images/clusterapi-tester/NAME
+++ b/test/images/clusterapi-tester/NAME
-clusterapi-tester
--- a/test/images/clusterapi-tester/VERSION
+++ b/test/images/clusterapi-tester/VERSION
-1.1
+1.0
--- a/test/images/nvidia-cuda/BASEIMAGE
+++ b/test/images/nvidia-cuda/BASEIMAGE
--- a/test/images/nvidia-cuda/Dockerfile
+++ b/test/images/nvidia-cuda/Dockerfile
--- a/test/images/nvidia-cuda/README.md
+++ b/test/images/nvidia-cuda/README.md
--- a/test/images/cuda-vector-add/VERSION
+++ b/test/images/cuda-vector-add/VERSION
+1.0
--- a/test/images/dnsutils/NAME
+++ b/test/images/dnsutils/NAME
-dnsutils
--- a/test/images/dnsutils/VERSION
+++ b/test/images/dnsutils/VERSION
-1.1
+1.0
--- a/test/images/entrypoint-tester/NAME
+++ b/test/images/entrypoint-tester/NAME
-ep
--- a/test/images/entrypoint-tester/VERSION
+++ b/test/images/entrypoint-tester/VERSION
-0.2
+1.0
--- a/test/images/fakegitserver/NAME
+++ b/test/images/fakegitserver/NAME
-fakegitserver
--- a/test/images/fakegitserver/VERSION
+++ b/test/images/fakegitserver/VERSION
-0.2
+1.0
--- a/test/images/goproxy/NAME
+++ b/test/images/goproxy/NAME
-goproxy
--- a/test/images/goproxy/VERSION
+++ b/test/images/goproxy/VERSION
-0.2
+1.0
--- a/test/images/hostexec/NAME
+++ b/test/images/hostexec/NAME
-hostexec
--- a/test/images/hostexec/VERSION
+++ b/test/images/hostexec/VERSION
-1.3
+1.0
--- a/test/images/image-util.sh
+++ b/test/images/image-util.sh
@@ -63,8 +63,6 @@ build() {
    pushd ${temp_dir}
    # image tag
    TAG=$(<VERSION)
-    # image name
-    IMAGENAME=$(<NAME)

    if [[ -f BASEIMAGE ]]; then
      BASEIMAGE=$(getBaseImage ${arch})
@@ -84,12 +82,8 @@ build() {
      fi
    fi

-    docker build --pull -t ${REGISTRY}/${IMAGENAME}-${arch}:${TAG} .
+    docker build --pull -t ${REGISTRY}/${IMAGE}-${arch}:${TAG} .

-    # Image without any arch postfix will point to amd64 by default.
-    if [[ "${arch}" == "amd64" ]]; then
-      docker tag ${REGISTRY}/${IMAGENAME}-${arch}:${TAG} ${REGISTRY}/${IMAGENAME}:${TAG}
-    fi
    popd
  done
 }
@@ -102,12 +96,8 @@ push() {
    archs=${!QEMUARCHS[@]}
  fi
  for arch in ${archs}; do
-    IMAGENAME=$(<${IMAGE}/NAME)
    TAG=$(<${IMAGE}/VERSION)
-    gcloud docker -- push ${REGISTRY}/${IMAGENAME}-${arch}:${TAG}
-    if [[ "${arch}" == "amd64" ]]; then
-      gcloud docker -- push ${REGISTRY}/${IMAGENAME}:${TAG}
-    fi
+    gcloud docker -- push ${REGISTRY}/${IMAGE}-${arch}:${TAG}
  done
 }


--- a/test/images/iperf/NAME
+++ b/test/images/iperf/NAME
-iperf
--- a/test/images/iperf/VERSION
+++ b/test/images/iperf/VERSION
-0.1
+1.0
--- a/test/images/jessie-dnsutils/NAME
+++ b/test/images/jessie-dnsutils/NAME
-jessie-dnsutils
--- a/test/images/jessie-dnsutils/VERSION
+++ b/test/images/jessie-dnsutils/VERSION
-0.1
+1.0
--- a/test/images/logs-generator/NAME
+++ b/test/images/logs-generator/NAME
-logs-generator
--- a/test/images/logs-generator/VERSION
+++ b/test/images/logs-generator/VERSION
-v0.1.2
+1.0
--- a/test/images/mount-tester-user/BASEIMAGE
+++ b/test/images/mount-tester-user/BASEIMAGE
-amd64=gcr.io/google_containers/mounttest-amd64:0.9
-arm=gcr.io/google_containers/mounttest-arm:0.9
-arm64=gcr.io/google_containers/mounttest-arm64:0.9
-ppc64le=gcr.io/google_containers/mounttest-ppc64le:0.9
-s390x=gcr.io/google_containers/mounttest-s390x:0.9
--- a/test/images/mount-tester-user/NAME
+++ b/test/images/mount-tester-user/NAME
-mounttest-user
--- a/test/images/mount-tester-user/VERSION
+++ b/test/images/mount-tester-user/VERSION
-0.6
--- a/test/images/mount-tester/NAME
+++ b/test/images/mount-tester/NAME
-mounttest
--- a/test/images/mount-tester/VERSION
+++ b/test/images/mount-tester/VERSION
-0.9
--- a/test/images/mounttest-user/BASEIMAGE
+++ b/test/images/mounttest-user/BASEIMAGE
+amd64=gcr.io/kubernetes-e2e-test-images/mounttest-amd64:1.0
+arm=gcr.io/kubernetes-e2e-test-images/mounttest-arm:1.0
+arm64=gcr.io/kubernetes-e2e-test-images/mounttest-arm64:1.0
+ppc64le=gcr.io/kubernetes-e2e-test-images/mounttest-ppc64le:1.0
+s390x=gcr.io/kubernetes-e2e-test-images/mounttest-s390x:1.0
--- a/test/images/mount-tester-user/Dockerfile
+++ b/test/images/mount-tester-user/Dockerfile
--- a/test/images/mounttest-user/VERSION
+++ b/test/images/mounttest-user/VERSION
+1.0
--- a/test/images/mount-tester/BUILD
+++ b/test/images/mount-tester/BUILD
@@ -8,12 +8,6 @@ load(
    "go_library",
 )

-go_binary(
-    name = "mount-tester",
-    library = ":go_default_library",
-    tags = ["automanaged"],
-)
-
 go_library(
    name = "go_default_library",
    srcs = ["mt.go"],
@@ -32,3 +26,9 @@ filegroup(
    srcs = [":package-srcs"],
    tags = ["automanaged"],
 )
+
+go_binary(
+    name = "mounttest",
+    library = ":go_default_library",
+    tags = ["automanaged"],
+)
--- a/test/images/mount-tester/Dockerfile
+++ b/test/images/mount-tester/Dockerfile
--- a/test/images/mount-tester/Makefile
+++ b/test/images/mount-tester/Makefile
--- a/test/images/mounttest/VERSION
+++ b/test/images/mounttest/VERSION
+1.0
--- a/test/images/mount-tester/mt.go
+++ b/test/images/mount-tester/mt.go
--- a/test/images/n-way-http/NAME
+++ b/test/images/n-way-http/NAME
-n-way-http
--- a/test/images/n-way-http/VERSION
+++ b/test/images/n-way-http/VERSION
-1.1
+1.0
--- a/test/images/net/NAME
+++ b/test/images/net/NAME
-e2e-net
--- a/test/images/net/VERSION
+++ b/test/images/net/VERSION
-1.1
+1.0
--- a/test/images/netexec/NAME
+++ b/test/images/netexec/NAME
-netexec
--- a/test/images/netexec/VERSION
+++ b/test/images/netexec/VERSION
-1.8
+1.0
--- a/test/images/network-tester/BUILD
+++ b/test/images/network-tester/BUILD
@@ -8,12 +8,6 @@ load(
    "go_library",
 )

-go_binary(
-    name = "network-tester",
-    library = ":go_default_library",
-    tags = ["automanaged"],
-)
-
 go_library(
    name = "go_default_library",
    srcs = ["nettest.go"],
@@ -38,3 +32,9 @@ filegroup(
    srcs = [":package-srcs"],
    tags = ["automanaged"],
 )
+
+go_binary(
+    name = "nettest",
+    library = ":go_default_library",
+    tags = ["automanaged"],
+)
--- a/test/images/network-tester/Dockerfile
+++ b/test/images/network-tester/Dockerfile
--- a/test/images/network-tester/Makefile
+++ b/test/images/network-tester/Makefile
--- a/test/images/nettest/VERSION
+++ b/test/images/nettest/VERSION
+1.0
--- a/test/images/network-tester/nettest.go
+++ b/test/images/network-tester/nettest.go
--- a/test/images/network-tester/rc.json
+++ b/test/images/network-tester/rc.json
--- a/test/images/network-tester/service.json
+++ b/test/images/network-tester/service.json
--- a/test/images/network-tester/slow-pod.json
+++ b/test/images/network-tester/slow-pod.json
--- a/test/images/network-tester/slow-rc.json
+++ b/test/images/network-tester/slow-rc.json
--- a/test/images/network-tester/NAME
+++ b/test/images/network-tester/NAME
-nettest
--- a/test/images/network-tester/VERSION
+++ b/test/images/network-tester/VERSION
-2.0
--- a/test/images/no-snat-test-proxy/NAME
+++ b/test/images/no-snat-test-proxy/NAME
-no-snat-test-proxy
--- a/test/images/no-snat-test-proxy/VERSION
+++ b/test/images/no-snat-test-proxy/VERSION
-1.0.2
+1.0
--- a/test/images/no-snat-test/NAME
+++ b/test/images/no-snat-test/NAME
-no-snat-test
--- a/test/images/no-snat-test/VERSION
+++ b/test/images/no-snat-test/VERSION
-1.0.2
+1.0
--- a/test/images/nvidia-cuda/NAME
+++ b/test/images/nvidia-cuda/NAME
-cuda-vector-add
--- a/test/images/nvidia-cuda/VERSION
+++ b/test/images/nvidia-cuda/VERSION
-v0.2
--- a/test/images/port-forward-tester/NAME
+++ b/test/images/port-forward-tester/NAME
-portforwardtester
--- a/test/images/port-forward-tester/VERSION
+++ b/test/images/port-forward-tester/VERSION
-1.3
+1.0
--- a/test/images/porter/NAME
+++ b/test/images/porter/NAME
-porter
--- a/test/images/porter/VERSION
+++ b/test/images/porter/VERSION
-0.1
+1.0
--- a/test/images/redis/NAME
+++ b/test/images/redis/NAME
-redis
--- a/test/images/redis/VERSION
+++ b/test/images/redis/VERSION
-0.1
+1.0
--- a/test/images/resource-consumer/NAME
+++ b/test/images/resource-consumer/NAME
-resource_consumer
--- a/test/images/resource-consumer/VERSION
+++ b/test/images/resource-consumer/VERSION
-0.1
+1.0
--- a/test/images/resource-consumer/controller/NAME
+++ b/test/images/resource-consumer/controller/NAME
-resource_consumer/controller
--- a/test/images/resource-consumer/controller/VERSION
+++ b/test/images/resource-consumer/controller/VERSION
-0.1
+1.0
--- a/test/images/serve_hostname/BASEIMAGE
+++ b/test/images/serve_hostname/BASEIMAGE
--- a/test/images/serve_hostname/BUILD
+++ b/test/images/serve_hostname/BUILD
@@ -8,12 +8,6 @@ load(
    "go_library",
 )

-go_binary(
-    name = "serve_hostname",
-    library = ":go_default_library",
-    tags = ["automanaged"],
-)
-
 go_library(
    name = "go_default_library",
    srcs = ["serve_hostname.go"],
@@ -32,3 +26,9 @@ filegroup(
    srcs = [":package-srcs"],
    tags = ["automanaged"],
 )
+
+go_binary(
+    name = "serve-hostname",
+    library = ":go_default_library",
+    tags = ["automanaged"],
+)
--- a/test/images/serve_hostname/Dockerfile
+++ b/test/images/serve_hostname/Dockerfile
--- a/test/images/serve_hostname/Makefile
+++ b/test/images/serve_hostname/Makefile
--- a/test/images/serve_hostname/README.md
+++ b/test/images/serve_hostname/README.md
--- a/test/images/serve-hostname/VERSION
+++ b/test/images/serve-hostname/VERSION
+1.0
--- a/test/images/serve_hostname/serve_hostname.go
+++ b/test/images/serve_hostname/serve_hostname.go
--- a/test/images/serve_hostname/NAME
+++ b/test/images/serve_hostname/NAME
-serve_hostname
--- a/test/images/serve_hostname/VERSION
+++ b/test/images/serve_hostname/VERSION
-v1.7