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

Remove unused images

Browse Source 
Change-Id: I6be2d14df736f5ae592d7e95713445b3d1c67a16
This commit is contained in:
Davanum Srinivas 2018-07-26 06:10:35 -04:00
parent a599697b87
commit 0965db0ccf
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/common/util.go
View File

@ -65,7 +65,7 @@ var CommonImageWhiteList = sets.NewString(
imageutils.GetE2EImage(imageutils.Hostexec), imageutils.GetE2EImage(imageutils.Hostexec),
imageutils.GetE2EImage(imageutils.VolumeNFSServer), imageutils.GetE2EImage(imageutils.VolumeNFSServer),
imageutils.GetE2EImage(imageutils.VolumeGlusterServer), imageutils.GetE2EImage(imageutils.VolumeGlusterServer),
imageutils.GetE2EImage(imageutils.E2ENet), imageutils.GetE2EImage(imageutils.Net),
) )
func svcByName(name string, port int) *v1.Service { func svcByName(name string, port int) *v1.Service {

4
test/e2e/network/dns_common.go
View File

@ -286,7 +286,7 @@ func generateDNSServerPod(aRecords map[string]string) *v1.Pod {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "dns", Name: "dns",
Image: imageutils.GetE2EImage(imageutils.DNSMasq), Image: imageutils.GetE2EImage(imageutils.Dnsutils),
Command: []string{ Command: []string{
"/usr/sbin/dnsmasq", "/usr/sbin/dnsmasq",
"-u", "root", "-u", "root",
@ -338,7 +338,7 @@ func (t *dnsTestCommon) createDNSServerWithPtrRecord() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "dns", Name: "dns",
Image: imageutils.GetE2EImage(imageutils.DNSMasq), Image: imageutils.GetE2EImage(imageutils.Dnsutils),
Command: []string{ Command: []string{
"/usr/sbin/dnsmasq", "/usr/sbin/dnsmasq",
"-u", "root", "-u", "root",

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

@ -53,17 +53,13 @@ var (
AppArmorLoader = ImageConfig{gcRegistry, "apparmor-loader", "0.1", false} AppArmorLoader = ImageConfig{gcRegistry, "apparmor-loader", "0.1", false}
BusyBox = ImageConfig{gcRegistry, "busybox", "1.24", false} BusyBox = ImageConfig{gcRegistry, "busybox", "1.24", false}
CheckMetadataConcealment = ImageConfig{gcRegistry, "check-metadata-concealment", "v0.0.3", false} CheckMetadataConcealment = ImageConfig{gcRegistry, "check-metadata-concealment", "v0.0.3", false}
ClusterTester = ImageConfig{e2eRegistry, "clusterapi-tester", "1.0", false}
CudaVectorAdd = ImageConfig{e2eRegistry, "cuda-vector-add", "1.0", false} CudaVectorAdd = ImageConfig{e2eRegistry, "cuda-vector-add", "1.0", false}
Dnsutils = ImageConfig{e2eRegistry, "dnsutils", "1.1", false} Dnsutils = ImageConfig{e2eRegistry, "dnsutils", "1.1", false}
DNSMasq = ImageConfig{gcRegistry, "k8s-dns-dnsmasq", "1.14.5", true}
EchoServer = ImageConfig{gcRegistry, "echoserver", "1.10", false} EchoServer = ImageConfig{gcRegistry, "echoserver", "1.10", false}
EntrypointTester = ImageConfig{e2eRegistry, "entrypoint-tester", "1.0", false} EntrypointTester = ImageConfig{e2eRegistry, "entrypoint-tester", "1.0", false}
E2ENet = ImageConfig{gcRegistry, "e2e-net", "1.0", true}
Fakegitserver = ImageConfig{e2eRegistry, "fakegitserver", "1.0", false} Fakegitserver = ImageConfig{e2eRegistry, "fakegitserver", "1.0", false}
GBFrontend = ImageConfig{sampleRegistry, "gb-frontend", "v5", false} GBFrontend = ImageConfig{sampleRegistry, "gb-frontend", "v5", false}
GBRedisSlave = ImageConfig{sampleRegistry, "gb-redisslave", "v2", false} GBRedisSlave = ImageConfig{sampleRegistry, "gb-redisslave", "v2", false}
Goproxy = ImageConfig{e2eRegistry, "goproxy", "1.0", false}
Hostexec = ImageConfig{e2eRegistry, "hostexec", "1.1", false} Hostexec = ImageConfig{e2eRegistry, "hostexec", "1.1", false}
IpcUtils = ImageConfig{e2eRegistry, "ipc-utils", "1.0", false} IpcUtils = ImageConfig{e2eRegistry, "ipc-utils", "1.0", false}
Iperf = ImageConfig{e2eRegistry, "iperf", "1.0", false} Iperf = ImageConfig{e2eRegistry, "iperf", "1.0", false}
@ -82,7 +78,6 @@ var (
Nonewprivs = ImageConfig{e2eRegistry, "nonewprivs", "1.0", false} Nonewprivs = ImageConfig{e2eRegistry, "nonewprivs", "1.0", false}
NoSnatTest = ImageConfig{e2eRegistry, "no-snat-test", "1.0", false} NoSnatTest = ImageConfig{e2eRegistry, "no-snat-test", "1.0", false}
NoSnatTestProxy = ImageConfig{e2eRegistry, "no-snat-test-proxy", "1.0", false} NoSnatTestProxy = ImageConfig{e2eRegistry, "no-snat-test-proxy", "1.0", false}
NWayHTTP = ImageConfig{e2eRegistry, "n-way-http", "1.0", false}
// When these values are updated, also update cmd/kubelet/app/options/container_runtime.go // When these values are updated, also update cmd/kubelet/app/options/container_runtime.go
Pause = ImageConfig{gcRegistry, "pause", "3.1", false} Pause = ImageConfig{gcRegistry, "pause", "3.1", false}
Porter = ImageConfig{e2eRegistry, "porter", "1.0", false} Porter = ImageConfig{e2eRegistry, "porter", "1.0", false}
@ -90,7 +85,6 @@ var (
Redis = ImageConfig{e2eRegistry, "redis", "1.0", false} Redis = ImageConfig{e2eRegistry, "redis", "1.0", false}
ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.3", false} ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.3", false}
ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0", false} ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0", false}
SDDummyExporter = ImageConfig{gcRegistry, "sd-dummy-exporter", "v0.1.0", false}
ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.1", false} ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.1", false}
TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0", false} TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0", false}
VolumeNFSServer = ImageConfig{e2eRegistry, "volume-nfs", "0.8", false} VolumeNFSServer = ImageConfig{e2eRegistry, "volume-nfs", "0.8", false}