github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75115 from bclau/resource-consumer-controller

Browse Source 
Uses the resource-consumer/controller image instead of resource-consumer-controller
This commit is contained in:
Kubernetes Prow Robot 2019-05-06 15:29:40 -07:00 committed by GitHub
commit 3d800dff75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/images/BUILD
View File

@ -33,6 +33,7 @@ filegroup(
"//test/images/porter:all-srcs",
"//test/images/regression-issue-74839: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",

0
test/images/resource-consumer/controller/BASEIMAGE → test/images/resource-consumer-controller/BASEIMAGE
View File

2
test/images/resource-consumer/controller/BUILD → test/images/resource-consumer-controller/BUILD
View File

@ -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"],
)

0
test/images/resource-consumer/controller/Dockerfile → test/images/resource-consumer-controller/Dockerfile
View File

4
test/images/resource-consumer/controller/Makefile → test/images/resource-consumer-controller/Makefile
View File

@ -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

0
test/images/resource-consumer/controller/VERSION → test/images/resource-consumer-controller/VERSION
View File

0
test/images/resource-consumer/controller/controller.go → test/images/resource-consumer-controller/controller.go
View File

1
test/images/resource-consumer/BUILD
View File

@ -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"],
)

2
test/utils/image/manifest.go
View File

@ -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"}