Uses the resource-consumer/controller image instead of resource-consumer-controller

Dockerhub does not support slashes in the image names, so when the tests are configured to use a dockerhub registry instead of the current gcr.io/kubernetes-e2e-test-images registry, the tests using the mentioned image will fail, as the image cannot exist and cannot be pulled.

Uses the resource-consumer/controller image instead of resource-consumer-controller
53df13ac · Claudiu Belu · bf4e93da · 53df13ac · 53df13ac · 53df13ac
Commit 53df13ac authored Mar 05, 2019 by Claudiu Belu
9 changed files
--- a/test/images/BUILD
+++ b/test/images/BUILD
@@ -31,6 +31,7 @@ filegroup(
        "//test/images/port-forward-tester:all-srcs",
        "//test/images/porter:all-srcs",
        "//test/images/resource-consumer:all-srcs",
+        "//test/images/resource-consumer-controller:all-srcs",
        "//test/images/sample-apiserver:all-srcs",
        "//test/images/sample-device-plugin:all-srcs",
        "//test/images/serve-hostname:all-srcs",

--- a/test/images/resource-consumer/controller/BASEIMAGE
+++ b/test/images/resource-consumer/controller/BASEIMAGE
--- a/test/images/resource-consumer/controller/BUILD
+++ b/test/images/resource-consumer/controller/BUILD
@@ -14,7 +14,7 @@ go_binary(
 go_library(
    name = "go_default_library",
    srcs = ["controller.go"],
-    importpath = "k8s.io/kubernetes/test/images/resource-consumer/controller",
+    importpath = "k8s.io/kubernetes/test/images/resource-consumer-controller",
    deps = ["//test/images/resource-consumer/common:go_default_library"],
 )


--- a/test/images/resource-consumer/controller/Dockerfile
+++ b/test/images/resource-consumer/controller/Dockerfile
--- a/test/images/resource-consumer/controller/Makefile
+++ b/test/images/resource-consumer/controller/Makefile
@@ -16,10 +16,10 @@ SRCS=controller
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
 GOLANG_VERSION ?= latest
-SRC_DIR = resource-consumer/$(notdir $(shell pwd))
+SRC_DIR = $(notdir $(shell pwd))
 export

 bin:
-	../../image-util.sh bin $(SRCS)
+	../image-util.sh bin $(SRCS)

 .PHONY: bin
--- a/test/images/resource-consumer/controller/VERSION
+++ b/test/images/resource-consumer/controller/VERSION
--- a/test/images/resource-consumer/controller/controller.go
+++ b/test/images/resource-consumer/controller/controller.go
--- a/test/images/resource-consumer/BUILD
+++ b/test/images/resource-consumer/BUILD
@@ -35,7 +35,6 @@ filegroup(
        ":package-srcs",
        "//test/images/resource-consumer/common:all-srcs",
        "//test/images/resource-consumer/consume-cpu:all-srcs",
-        "//test/images/resource-consumer/controller:all-srcs",
    ],
    tags = ["automanaged"],
 )
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -234,7 +234,7 @@ func initImageConfigs() map[int]Config {
 	configs[PortForwardTester] = Config{e2eRegistry, "port-forward-tester", "1.0"}
 	configs[Redis] = Config{e2eRegistry, "redis", "1.0"}
 	configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"}
-	configs[ResourceController] = Config{e2eRegistry, "resource-consumer/controller", "1.0"}
+	configs[ResourceController] = Config{e2eRegistry, "resource-consumer-controller", "1.0"}
 	configs[ServeHostname] = Config{e2eRegistry, "serve-hostname", "1.1"}
 	configs[TestWebserver] = Config{e2eRegistry, "test-webserver", "1.0"}
 	configs[VolumeNFSServer] = Config{e2eRegistry, "volume/nfs", "1.0"}