mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #75115 from bclau/resource-consumer-controller
Uses the resource-consumer/controller image instead of resource-consumer-controller
This commit is contained in:
commit
3d800dff75
@ -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",
|
||||
|
@ -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"],
|
||||
)
|
||||
|
@ -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
|
@ -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"],
|
||||
)
|
||||
|
@ -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"}
|
||||
|
Loading…
Reference in New Issue
Block a user