From 19ca6ca9f2cbb0056766e46a6a0c69c40d990287 Mon Sep 17 00:00:00 2001
From: Manjunath A Kumatagi <mkumatag@in.ibm.com>
Date: Fri, 30 Jun 2017 18:43:55 +0530
Subject: [PATCH] Fix review comments - luxas, ixdy

---
 test/images/BUILD                                  |  6 +++---
 test/images/Makefile                               |  2 +-
 test/images/clusterapi-tester/NAME                 |  1 -
 test/images/clusterapi-tester/VERSION              |  2 +-
 .../{nvidia-cuda => cuda-vector-add}/BASEIMAGE     |  0
 .../{nvidia-cuda => cuda-vector-add}/Dockerfile    |  0
 .../{nvidia-cuda => cuda-vector-add}/README.md     |  0
 test/images/cuda-vector-add/VERSION                |  1 +
 test/images/dnsutils/NAME                          |  1 -
 test/images/dnsutils/VERSION                       |  2 +-
 test/images/entrypoint-tester/NAME                 |  1 -
 test/images/entrypoint-tester/VERSION              |  2 +-
 test/images/fakegitserver/NAME                     |  1 -
 test/images/fakegitserver/VERSION                  |  2 +-
 test/images/goproxy/NAME                           |  1 -
 test/images/goproxy/VERSION                        |  2 +-
 test/images/hostexec/NAME                          |  1 -
 test/images/hostexec/VERSION                       |  2 +-
 test/images/image-util.sh                          | 14 ++------------
 test/images/iperf/NAME                             |  1 -
 test/images/iperf/VERSION                          |  2 +-
 test/images/jessie-dnsutils/NAME                   |  1 -
 test/images/jessie-dnsutils/VERSION                |  2 +-
 test/images/logs-generator/NAME                    |  1 -
 test/images/logs-generator/VERSION                 |  2 +-
 test/images/mount-tester-user/BASEIMAGE            |  5 -----
 test/images/mount-tester-user/NAME                 |  1 -
 test/images/mount-tester-user/VERSION              |  1 -
 test/images/mount-tester/NAME                      |  1 -
 test/images/mount-tester/VERSION                   |  1 -
 test/images/mounttest-user/BASEIMAGE               |  5 +++++
 .../Dockerfile                                     |  0
 test/images/mounttest-user/VERSION                 |  1 +
 test/images/{mount-tester => mounttest}/BUILD      | 12 ++++++------
 test/images/{mount-tester => mounttest}/Dockerfile |  0
 test/images/{mount-tester => mounttest}/Makefile   |  0
 test/images/mounttest/VERSION                      |  1 +
 test/images/{mount-tester => mounttest}/mt.go      |  0
 test/images/n-way-http/NAME                        |  1 -
 test/images/n-way-http/VERSION                     |  2 +-
 test/images/net/NAME                               |  1 -
 test/images/net/VERSION                            |  2 +-
 test/images/netexec/NAME                           |  1 -
 test/images/netexec/VERSION                        |  2 +-
 test/images/{network-tester => nettest}/BUILD      | 12 ++++++------
 test/images/{network-tester => nettest}/Dockerfile |  0
 test/images/{network-tester => nettest}/Makefile   |  0
 test/images/nettest/VERSION                        |  1 +
 test/images/{network-tester => nettest}/nettest.go |  0
 test/images/{network-tester => nettest}/rc.json    |  0
 .../{network-tester => nettest}/service.json       |  0
 .../{network-tester => nettest}/slow-pod.json      |  0
 .../{network-tester => nettest}/slow-rc.json       |  0
 test/images/network-tester/NAME                    |  1 -
 test/images/network-tester/VERSION                 |  1 -
 test/images/no-snat-test-proxy/NAME                |  1 -
 test/images/no-snat-test-proxy/VERSION             |  2 +-
 test/images/no-snat-test/NAME                      |  1 -
 test/images/no-snat-test/VERSION                   |  2 +-
 test/images/nvidia-cuda/NAME                       |  1 -
 test/images/nvidia-cuda/VERSION                    |  1 -
 test/images/port-forward-tester/NAME               |  1 -
 test/images/port-forward-tester/VERSION            |  2 +-
 test/images/porter/NAME                            |  1 -
 test/images/porter/VERSION                         |  2 +-
 test/images/redis/NAME                             |  1 -
 test/images/redis/VERSION                          |  2 +-
 test/images/resource-consumer/NAME                 |  1 -
 test/images/resource-consumer/VERSION              |  2 +-
 test/images/resource-consumer/controller/NAME      |  1 -
 test/images/resource-consumer/controller/VERSION   |  2 +-
 .../{serve_hostname => serve-hostname}/BASEIMAGE   |  0
 .../{serve_hostname => serve-hostname}/BUILD       | 12 ++++++------
 .../{serve_hostname => serve-hostname}/Dockerfile  |  0
 .../{serve_hostname => serve-hostname}/Makefile    |  0
 .../{serve_hostname => serve-hostname}/README.md   |  0
 test/images/serve-hostname/VERSION                 |  1 +
 .../serve_hostname.go                              |  0
 test/images/serve_hostname/NAME                    |  1 -
 test/images/serve_hostname/VERSION                 |  1 -
 80 files changed, 53 insertions(+), 87 deletions(-)
 delete mode 100644 test/images/clusterapi-tester/NAME
 rename test/images/{nvidia-cuda => cuda-vector-add}/BASEIMAGE (100%)
 rename test/images/{nvidia-cuda => cuda-vector-add}/Dockerfile (100%)
 rename test/images/{nvidia-cuda => cuda-vector-add}/README.md (100%)
 create mode 100644 test/images/cuda-vector-add/VERSION
 delete mode 100644 test/images/dnsutils/NAME
 delete mode 100644 test/images/entrypoint-tester/NAME
 delete mode 100644 test/images/fakegitserver/NAME
 delete mode 100644 test/images/goproxy/NAME
 delete mode 100644 test/images/hostexec/NAME
 delete mode 100644 test/images/iperf/NAME
 delete mode 100644 test/images/jessie-dnsutils/NAME
 delete mode 100644 test/images/logs-generator/NAME
 delete mode 100644 test/images/mount-tester-user/BASEIMAGE
 delete mode 100644 test/images/mount-tester-user/NAME
 delete mode 100644 test/images/mount-tester-user/VERSION
 delete mode 100644 test/images/mount-tester/NAME
 delete mode 100644 test/images/mount-tester/VERSION
 create mode 100644 test/images/mounttest-user/BASEIMAGE
 rename test/images/{mount-tester-user => mounttest-user}/Dockerfile (100%)
 create mode 100644 test/images/mounttest-user/VERSION
 rename test/images/{mount-tester => mounttest}/BUILD (95%)
 rename test/images/{mount-tester => mounttest}/Dockerfile (100%)
 rename test/images/{mount-tester => mounttest}/Makefile (100%)
 create mode 100644 test/images/mounttest/VERSION
 rename test/images/{mount-tester => mounttest}/mt.go (100%)
 delete mode 100644 test/images/n-way-http/NAME
 delete mode 100644 test/images/net/NAME
 delete mode 100644 test/images/netexec/NAME
 rename test/images/{network-tester => nettest}/BUILD (96%)
 rename test/images/{network-tester => nettest}/Dockerfile (100%)
 rename test/images/{network-tester => nettest}/Makefile (100%)
 create mode 100644 test/images/nettest/VERSION
 rename test/images/{network-tester => nettest}/nettest.go (100%)
 rename test/images/{network-tester => nettest}/rc.json (100%)
 rename test/images/{network-tester => nettest}/service.json (100%)
 rename test/images/{network-tester => nettest}/slow-pod.json (100%)
 rename test/images/{network-tester => nettest}/slow-rc.json (100%)
 delete mode 100644 test/images/network-tester/NAME
 delete mode 100644 test/images/network-tester/VERSION
 delete mode 100644 test/images/no-snat-test-proxy/NAME
 delete mode 100644 test/images/no-snat-test/NAME
 delete mode 100644 test/images/nvidia-cuda/NAME
 delete mode 100644 test/images/nvidia-cuda/VERSION
 delete mode 100644 test/images/port-forward-tester/NAME
 delete mode 100644 test/images/porter/NAME
 delete mode 100644 test/images/redis/NAME
 delete mode 100644 test/images/resource-consumer/NAME
 delete mode 100644 test/images/resource-consumer/controller/NAME
 rename test/images/{serve_hostname => serve-hostname}/BASEIMAGE (100%)
 rename test/images/{serve_hostname => serve-hostname}/BUILD (95%)
 rename test/images/{serve_hostname => serve-hostname}/Dockerfile (100%)
 rename test/images/{serve_hostname => serve-hostname}/Makefile (100%)
 rename test/images/{serve_hostname => serve-hostname}/README.md (100%)
 create mode 100644 test/images/serve-hostname/VERSION
 rename test/images/{serve_hostname => serve-hostname}/serve_hostname.go (100%)
 delete mode 100644 test/images/serve_hostname/NAME
 delete mode 100644 test/images/serve_hostname/VERSION

diff --git a/test/images/BUILD b/test/images/BUILD
index 4424ecf83c1..009d86244a1 100644
--- 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"],
 )
diff --git a/test/images/Makefile b/test/images/Makefile
index 9d5aeb5ebc5..450b17beb7c 100644
--- 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
diff --git a/test/images/clusterapi-tester/NAME b/test/images/clusterapi-tester/NAME
deleted file mode 100644
index 97185c48995..00000000000
--- a/test/images/clusterapi-tester/NAME
+++ /dev/null
@@ -1 +0,0 @@
-clusterapi-tester
diff --git a/test/images/clusterapi-tester/VERSION b/test/images/clusterapi-tester/VERSION
index 9459d4ba2a0..d3827e75a5c 100644
--- a/test/images/clusterapi-tester/VERSION
+++ b/test/images/clusterapi-tester/VERSION
@@ -1 +1 @@
-1.1
+1.0
diff --git a/test/images/nvidia-cuda/BASEIMAGE b/test/images/cuda-vector-add/BASEIMAGE
similarity index 100%
rename from test/images/nvidia-cuda/BASEIMAGE
rename to test/images/cuda-vector-add/BASEIMAGE
diff --git a/test/images/nvidia-cuda/Dockerfile b/test/images/cuda-vector-add/Dockerfile
similarity index 100%
rename from test/images/nvidia-cuda/Dockerfile
rename to test/images/cuda-vector-add/Dockerfile
diff --git a/test/images/nvidia-cuda/README.md b/test/images/cuda-vector-add/README.md
similarity index 100%
rename from test/images/nvidia-cuda/README.md
rename to test/images/cuda-vector-add/README.md
diff --git a/test/images/cuda-vector-add/VERSION b/test/images/cuda-vector-add/VERSION
new file mode 100644
index 00000000000..d3827e75a5c
--- /dev/null
+++ b/test/images/cuda-vector-add/VERSION
@@ -0,0 +1 @@
+1.0
diff --git a/test/images/dnsutils/NAME b/test/images/dnsutils/NAME
deleted file mode 100644
index bca3eb0f23f..00000000000
--- a/test/images/dnsutils/NAME
+++ /dev/null
@@ -1 +0,0 @@
-dnsutils
diff --git a/test/images/dnsutils/VERSION b/test/images/dnsutils/VERSION
index 9459d4ba2a0..d3827e75a5c 100644
--- a/test/images/dnsutils/VERSION
+++ b/test/images/dnsutils/VERSION
@@ -1 +1 @@
-1.1
+1.0
diff --git a/test/images/entrypoint-tester/NAME b/test/images/entrypoint-tester/NAME
deleted file mode 100644
index e2d8e243c18..00000000000
--- a/test/images/entrypoint-tester/NAME
+++ /dev/null
@@ -1 +0,0 @@
-ep
diff --git a/test/images/entrypoint-tester/VERSION b/test/images/entrypoint-tester/VERSION
index 3b04cfb60da..d3827e75a5c 100644
--- a/test/images/entrypoint-tester/VERSION
+++ b/test/images/entrypoint-tester/VERSION
@@ -1 +1 @@
-0.2
+1.0
diff --git a/test/images/fakegitserver/NAME b/test/images/fakegitserver/NAME
deleted file mode 100644
index 1f1e4b248bf..00000000000
--- a/test/images/fakegitserver/NAME
+++ /dev/null
@@ -1 +0,0 @@
-fakegitserver
diff --git a/test/images/fakegitserver/VERSION b/test/images/fakegitserver/VERSION
index 3b04cfb60da..d3827e75a5c 100644
--- a/test/images/fakegitserver/VERSION
+++ b/test/images/fakegitserver/VERSION
@@ -1 +1 @@
-0.2
+1.0
diff --git a/test/images/goproxy/NAME b/test/images/goproxy/NAME
deleted file mode 100644
index 663e1754bde..00000000000
--- a/test/images/goproxy/NAME
+++ /dev/null
@@ -1 +0,0 @@
-goproxy
diff --git a/test/images/goproxy/VERSION b/test/images/goproxy/VERSION
index 3b04cfb60da..d3827e75a5c 100644
--- a/test/images/goproxy/VERSION
+++ b/test/images/goproxy/VERSION
@@ -1 +1 @@
-0.2
+1.0
diff --git a/test/images/hostexec/NAME b/test/images/hostexec/NAME
deleted file mode 100644
index 0d7e9c73d9d..00000000000
--- a/test/images/hostexec/NAME
+++ /dev/null
@@ -1 +0,0 @@
-hostexec
diff --git a/test/images/hostexec/VERSION b/test/images/hostexec/VERSION
index 7e32cd56983..d3827e75a5c 100644
--- a/test/images/hostexec/VERSION
+++ b/test/images/hostexec/VERSION
@@ -1 +1 @@
-1.3
+1.0
diff --git a/test/images/image-util.sh b/test/images/image-util.sh
index 96ccaddfe4a..d9ff9e31e08 100755
--- 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
 }
 
diff --git a/test/images/iperf/NAME b/test/images/iperf/NAME
deleted file mode 100644
index b430f4c0b60..00000000000
--- a/test/images/iperf/NAME
+++ /dev/null
@@ -1 +0,0 @@
-iperf
diff --git a/test/images/iperf/VERSION b/test/images/iperf/VERSION
index 49d59571fbf..d3827e75a5c 100644
--- a/test/images/iperf/VERSION
+++ b/test/images/iperf/VERSION
@@ -1 +1 @@
-0.1
+1.0
diff --git a/test/images/jessie-dnsutils/NAME b/test/images/jessie-dnsutils/NAME
deleted file mode 100644
index 2f06a689a37..00000000000
--- a/test/images/jessie-dnsutils/NAME
+++ /dev/null
@@ -1 +0,0 @@
-jessie-dnsutils
diff --git a/test/images/jessie-dnsutils/VERSION b/test/images/jessie-dnsutils/VERSION
index 49d59571fbf..d3827e75a5c 100644
--- a/test/images/jessie-dnsutils/VERSION
+++ b/test/images/jessie-dnsutils/VERSION
@@ -1 +1 @@
-0.1
+1.0
diff --git a/test/images/logs-generator/NAME b/test/images/logs-generator/NAME
deleted file mode 100644
index 2f69b7468d2..00000000000
--- a/test/images/logs-generator/NAME
+++ /dev/null
@@ -1 +0,0 @@
-logs-generator
diff --git a/test/images/logs-generator/VERSION b/test/images/logs-generator/VERSION
index 536660087fb..d3827e75a5c 100644
--- a/test/images/logs-generator/VERSION
+++ b/test/images/logs-generator/VERSION
@@ -1 +1 @@
-v0.1.2
+1.0
diff --git a/test/images/mount-tester-user/BASEIMAGE b/test/images/mount-tester-user/BASEIMAGE
deleted file mode 100644
index 26e15033cac..00000000000
--- a/test/images/mount-tester-user/BASEIMAGE
+++ /dev/null
@@ -1,5 +0,0 @@
-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
diff --git a/test/images/mount-tester-user/NAME b/test/images/mount-tester-user/NAME
deleted file mode 100644
index b2626f6fd2b..00000000000
--- a/test/images/mount-tester-user/NAME
+++ /dev/null
@@ -1 +0,0 @@
-mounttest-user
diff --git a/test/images/mount-tester-user/VERSION b/test/images/mount-tester-user/VERSION
deleted file mode 100644
index 5a2a5806df6..00000000000
--- a/test/images/mount-tester-user/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.6
diff --git a/test/images/mount-tester/NAME b/test/images/mount-tester/NAME
deleted file mode 100644
index 4d172b0a85d..00000000000
--- a/test/images/mount-tester/NAME
+++ /dev/null
@@ -1 +0,0 @@
-mounttest
diff --git a/test/images/mount-tester/VERSION b/test/images/mount-tester/VERSION
deleted file mode 100644
index b63ba696b7a..00000000000
--- a/test/images/mount-tester/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.9
diff --git a/test/images/mounttest-user/BASEIMAGE b/test/images/mounttest-user/BASEIMAGE
new file mode 100644
index 00000000000..0d501766eeb
--- /dev/null
+++ b/test/images/mounttest-user/BASEIMAGE
@@ -0,0 +1,5 @@
+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
diff --git a/test/images/mount-tester-user/Dockerfile b/test/images/mounttest-user/Dockerfile
similarity index 100%
rename from test/images/mount-tester-user/Dockerfile
rename to test/images/mounttest-user/Dockerfile
diff --git a/test/images/mounttest-user/VERSION b/test/images/mounttest-user/VERSION
new file mode 100644
index 00000000000..d3827e75a5c
--- /dev/null
+++ b/test/images/mounttest-user/VERSION
@@ -0,0 +1 @@
+1.0
diff --git a/test/images/mount-tester/BUILD b/test/images/mounttest/BUILD
similarity index 95%
rename from test/images/mount-tester/BUILD
rename to test/images/mounttest/BUILD
index fcd536f4fec..ace9146b8c1 100644
--- a/test/images/mount-tester/BUILD
+++ b/test/images/mounttest/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"],
+)
diff --git a/test/images/mount-tester/Dockerfile b/test/images/mounttest/Dockerfile
similarity index 100%
rename from test/images/mount-tester/Dockerfile
rename to test/images/mounttest/Dockerfile
diff --git a/test/images/mount-tester/Makefile b/test/images/mounttest/Makefile
similarity index 100%
rename from test/images/mount-tester/Makefile
rename to test/images/mounttest/Makefile
diff --git a/test/images/mounttest/VERSION b/test/images/mounttest/VERSION
new file mode 100644
index 00000000000..d3827e75a5c
--- /dev/null
+++ b/test/images/mounttest/VERSION
@@ -0,0 +1 @@
+1.0
diff --git a/test/images/mount-tester/mt.go b/test/images/mounttest/mt.go
similarity index 100%
rename from test/images/mount-tester/mt.go
rename to test/images/mounttest/mt.go
diff --git a/test/images/n-way-http/NAME b/test/images/n-way-http/NAME
deleted file mode 100644
index ec0467b30c8..00000000000
--- a/test/images/n-way-http/NAME
+++ /dev/null
@@ -1 +0,0 @@
-n-way-http
diff --git a/test/images/n-way-http/VERSION b/test/images/n-way-http/VERSION
index 9459d4ba2a0..d3827e75a5c 100644
--- a/test/images/n-way-http/VERSION
+++ b/test/images/n-way-http/VERSION
@@ -1 +1 @@
-1.1
+1.0
diff --git a/test/images/net/NAME b/test/images/net/NAME
deleted file mode 100644
index 38fb2a28780..00000000000
--- a/test/images/net/NAME
+++ /dev/null
@@ -1 +0,0 @@
-e2e-net
diff --git a/test/images/net/VERSION b/test/images/net/VERSION
index 9459d4ba2a0..d3827e75a5c 100644
--- a/test/images/net/VERSION
+++ b/test/images/net/VERSION
@@ -1 +1 @@
-1.1
+1.0
diff --git a/test/images/netexec/NAME b/test/images/netexec/NAME
deleted file mode 100644
index 3b1fcb643ba..00000000000
--- a/test/images/netexec/NAME
+++ /dev/null
@@ -1 +0,0 @@
-netexec
diff --git a/test/images/netexec/VERSION b/test/images/netexec/VERSION
index 6259340971b..d3827e75a5c 100644
--- a/test/images/netexec/VERSION
+++ b/test/images/netexec/VERSION
@@ -1 +1 @@
-1.8
+1.0
diff --git a/test/images/network-tester/BUILD b/test/images/nettest/BUILD
similarity index 96%
rename from test/images/network-tester/BUILD
rename to test/images/nettest/BUILD
index fa660ff8c7c..516fae1aa51 100644
--- a/test/images/network-tester/BUILD
+++ b/test/images/nettest/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"],
+)
diff --git a/test/images/network-tester/Dockerfile b/test/images/nettest/Dockerfile
similarity index 100%
rename from test/images/network-tester/Dockerfile
rename to test/images/nettest/Dockerfile
diff --git a/test/images/network-tester/Makefile b/test/images/nettest/Makefile
similarity index 100%
rename from test/images/network-tester/Makefile
rename to test/images/nettest/Makefile
diff --git a/test/images/nettest/VERSION b/test/images/nettest/VERSION
new file mode 100644
index 00000000000..d3827e75a5c
--- /dev/null
+++ b/test/images/nettest/VERSION
@@ -0,0 +1 @@
+1.0
diff --git a/test/images/network-tester/nettest.go b/test/images/nettest/nettest.go
similarity index 100%
rename from test/images/network-tester/nettest.go
rename to test/images/nettest/nettest.go
diff --git a/test/images/network-tester/rc.json b/test/images/nettest/rc.json
similarity index 100%
rename from test/images/network-tester/rc.json
rename to test/images/nettest/rc.json
diff --git a/test/images/network-tester/service.json b/test/images/nettest/service.json
similarity index 100%
rename from test/images/network-tester/service.json
rename to test/images/nettest/service.json
diff --git a/test/images/network-tester/slow-pod.json b/test/images/nettest/slow-pod.json
similarity index 100%
rename from test/images/network-tester/slow-pod.json
rename to test/images/nettest/slow-pod.json
diff --git a/test/images/network-tester/slow-rc.json b/test/images/nettest/slow-rc.json
similarity index 100%
rename from test/images/network-tester/slow-rc.json
rename to test/images/nettest/slow-rc.json
diff --git a/test/images/network-tester/NAME b/test/images/network-tester/NAME
deleted file mode 100644
index 5c20a42f7c0..00000000000
--- a/test/images/network-tester/NAME
+++ /dev/null
@@ -1 +0,0 @@
-nettest
diff --git a/test/images/network-tester/VERSION b/test/images/network-tester/VERSION
deleted file mode 100644
index cd5ac039d67..00000000000
--- a/test/images/network-tester/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.0
diff --git a/test/images/no-snat-test-proxy/NAME b/test/images/no-snat-test-proxy/NAME
deleted file mode 100644
index f7643dc3ab8..00000000000
--- a/test/images/no-snat-test-proxy/NAME
+++ /dev/null
@@ -1 +0,0 @@
-no-snat-test-proxy
diff --git a/test/images/no-snat-test-proxy/VERSION b/test/images/no-snat-test-proxy/VERSION
index 6d7de6e6abe..d3827e75a5c 100644
--- a/test/images/no-snat-test-proxy/VERSION
+++ b/test/images/no-snat-test-proxy/VERSION
@@ -1 +1 @@
-1.0.2
+1.0
diff --git a/test/images/no-snat-test/NAME b/test/images/no-snat-test/NAME
deleted file mode 100644
index 97de61b8657..00000000000
--- a/test/images/no-snat-test/NAME
+++ /dev/null
@@ -1 +0,0 @@
-no-snat-test
diff --git a/test/images/no-snat-test/VERSION b/test/images/no-snat-test/VERSION
index 6d7de6e6abe..d3827e75a5c 100644
--- a/test/images/no-snat-test/VERSION
+++ b/test/images/no-snat-test/VERSION
@@ -1 +1 @@
-1.0.2
+1.0
diff --git a/test/images/nvidia-cuda/NAME b/test/images/nvidia-cuda/NAME
deleted file mode 100644
index a3cf7cef8ba..00000000000
--- a/test/images/nvidia-cuda/NAME
+++ /dev/null
@@ -1 +0,0 @@
-cuda-vector-add
diff --git a/test/images/nvidia-cuda/VERSION b/test/images/nvidia-cuda/VERSION
deleted file mode 100644
index 60fe1f267ba..00000000000
--- a/test/images/nvidia-cuda/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-v0.2
diff --git a/test/images/port-forward-tester/NAME b/test/images/port-forward-tester/NAME
deleted file mode 100644
index b43a4aae6d0..00000000000
--- a/test/images/port-forward-tester/NAME
+++ /dev/null
@@ -1 +0,0 @@
-portforwardtester
diff --git a/test/images/port-forward-tester/VERSION b/test/images/port-forward-tester/VERSION
index 7e32cd56983..d3827e75a5c 100644
--- a/test/images/port-forward-tester/VERSION
+++ b/test/images/port-forward-tester/VERSION
@@ -1 +1 @@
-1.3
+1.0
diff --git a/test/images/porter/NAME b/test/images/porter/NAME
deleted file mode 100644
index c5326cd9045..00000000000
--- a/test/images/porter/NAME
+++ /dev/null
@@ -1 +0,0 @@
-porter
diff --git a/test/images/porter/VERSION b/test/images/porter/VERSION
index 49d59571fbf..d3827e75a5c 100644
--- a/test/images/porter/VERSION
+++ b/test/images/porter/VERSION
@@ -1 +1 @@
-0.1
+1.0
diff --git a/test/images/redis/NAME b/test/images/redis/NAME
deleted file mode 100644
index 7800f0fad3f..00000000000
--- a/test/images/redis/NAME
+++ /dev/null
@@ -1 +0,0 @@
-redis
diff --git a/test/images/redis/VERSION b/test/images/redis/VERSION
index 49d59571fbf..d3827e75a5c 100644
--- a/test/images/redis/VERSION
+++ b/test/images/redis/VERSION
@@ -1 +1 @@
-0.1
+1.0
diff --git a/test/images/resource-consumer/NAME b/test/images/resource-consumer/NAME
deleted file mode 100644
index e5d59f192b6..00000000000
--- a/test/images/resource-consumer/NAME
+++ /dev/null
@@ -1 +0,0 @@
-resource_consumer
diff --git a/test/images/resource-consumer/VERSION b/test/images/resource-consumer/VERSION
index 49d59571fbf..d3827e75a5c 100644
--- a/test/images/resource-consumer/VERSION
+++ b/test/images/resource-consumer/VERSION
@@ -1 +1 @@
-0.1
+1.0
diff --git a/test/images/resource-consumer/controller/NAME b/test/images/resource-consumer/controller/NAME
deleted file mode 100644
index c5f345214b5..00000000000
--- a/test/images/resource-consumer/controller/NAME
+++ /dev/null
@@ -1 +0,0 @@
-resource_consumer/controller
diff --git a/test/images/resource-consumer/controller/VERSION b/test/images/resource-consumer/controller/VERSION
index 49d59571fbf..d3827e75a5c 100644
--- a/test/images/resource-consumer/controller/VERSION
+++ b/test/images/resource-consumer/controller/VERSION
@@ -1 +1 @@
-0.1
+1.0
diff --git a/test/images/serve_hostname/BASEIMAGE b/test/images/serve-hostname/BASEIMAGE
similarity index 100%
rename from test/images/serve_hostname/BASEIMAGE
rename to test/images/serve-hostname/BASEIMAGE
diff --git a/test/images/serve_hostname/BUILD b/test/images/serve-hostname/BUILD
similarity index 95%
rename from test/images/serve_hostname/BUILD
rename to test/images/serve-hostname/BUILD
index b2fc88ffc2d..22ccb86d6c1 100644
--- 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"],
+)
diff --git a/test/images/serve_hostname/Dockerfile b/test/images/serve-hostname/Dockerfile
similarity index 100%
rename from test/images/serve_hostname/Dockerfile
rename to test/images/serve-hostname/Dockerfile
diff --git a/test/images/serve_hostname/Makefile b/test/images/serve-hostname/Makefile
similarity index 100%
rename from test/images/serve_hostname/Makefile
rename to test/images/serve-hostname/Makefile
diff --git a/test/images/serve_hostname/README.md b/test/images/serve-hostname/README.md
similarity index 100%
rename from test/images/serve_hostname/README.md
rename to test/images/serve-hostname/README.md
diff --git a/test/images/serve-hostname/VERSION b/test/images/serve-hostname/VERSION
new file mode 100644
index 00000000000..d3827e75a5c
--- /dev/null
+++ b/test/images/serve-hostname/VERSION
@@ -0,0 +1 @@
+1.0
diff --git a/test/images/serve_hostname/serve_hostname.go b/test/images/serve-hostname/serve_hostname.go
similarity index 100%
rename from test/images/serve_hostname/serve_hostname.go
rename to test/images/serve-hostname/serve_hostname.go
diff --git a/test/images/serve_hostname/NAME b/test/images/serve_hostname/NAME
deleted file mode 100644
index 9b2a3ba6a62..00000000000
--- a/test/images/serve_hostname/NAME
+++ /dev/null
@@ -1 +0,0 @@
-serve_hostname
diff --git a/test/images/serve_hostname/VERSION b/test/images/serve_hostname/VERSION
deleted file mode 100644
index 7d9c8bd194b..00000000000
--- a/test/images/serve_hostname/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-v1.7