From 53df13ac22d5dd826611302d62145e38857720f5 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Tue, 5 Mar 2019 03:00:15 -0800 Subject: [PATCH] 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. --- test/images/BUILD | 1 + .../controller => resource-consumer-controller}/BASEIMAGE | 0 .../controller => resource-consumer-controller}/BUILD | 2 +- .../controller => resource-consumer-controller}/Dockerfile | 0 .../controller => resource-consumer-controller}/Makefile | 4 ++-- .../controller => resource-consumer-controller}/VERSION | 0 .../controller => resource-consumer-controller}/controller.go | 0 test/images/resource-consumer/BUILD | 1 - test/utils/image/manifest.go | 2 +- 9 files changed, 5 insertions(+), 5 deletions(-) rename test/images/{resource-consumer/controller => resource-consumer-controller}/BASEIMAGE (100%) rename test/images/{resource-consumer/controller => resource-consumer-controller}/BUILD (97%) rename test/images/{resource-consumer/controller => resource-consumer-controller}/Dockerfile (100%) rename test/images/{resource-consumer/controller => resource-consumer-controller}/Makefile (89%) rename test/images/{resource-consumer/controller => resource-consumer-controller}/VERSION (100%) rename test/images/{resource-consumer/controller => resource-consumer-controller}/controller.go (100%) diff --git a/test/images/BUILD b/test/images/BUILD index c9e026180bf..746b3b63a8f 100644 --- 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", diff --git a/test/images/resource-consumer/controller/BASEIMAGE b/test/images/resource-consumer-controller/BASEIMAGE similarity index 100% rename from test/images/resource-consumer/controller/BASEIMAGE rename to test/images/resource-consumer-controller/BASEIMAGE diff --git a/test/images/resource-consumer/controller/BUILD b/test/images/resource-consumer-controller/BUILD similarity index 97% rename from test/images/resource-consumer/controller/BUILD rename to test/images/resource-consumer-controller/BUILD index 4b817bbc6a9..2bb311ceaf4 100644 --- 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"], ) diff --git a/test/images/resource-consumer/controller/Dockerfile b/test/images/resource-consumer-controller/Dockerfile similarity index 100% rename from test/images/resource-consumer/controller/Dockerfile rename to test/images/resource-consumer-controller/Dockerfile diff --git a/test/images/resource-consumer/controller/Makefile b/test/images/resource-consumer-controller/Makefile similarity index 89% rename from test/images/resource-consumer/controller/Makefile rename to test/images/resource-consumer-controller/Makefile index 24564eeeefa..f1289530509 100644 --- 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 diff --git a/test/images/resource-consumer/controller/VERSION b/test/images/resource-consumer-controller/VERSION similarity index 100% rename from test/images/resource-consumer/controller/VERSION rename to test/images/resource-consumer-controller/VERSION diff --git a/test/images/resource-consumer/controller/controller.go b/test/images/resource-consumer-controller/controller.go similarity index 100% rename from test/images/resource-consumer/controller/controller.go rename to test/images/resource-consumer-controller/controller.go diff --git a/test/images/resource-consumer/BUILD b/test/images/resource-consumer/BUILD index 6de3a17aa79..2c28fce13ac 100644 --- 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"], ) diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 26f3e4b1c97..e44453b82a0 100644 --- 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"}