diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index be9ff8dc657..eb064d730a1 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -48,51 +48,51 @@ func (i *ImageConfig) SetVersion(version string) { } var ( - AdmissionWebhook = ImageConfig{e2eRegistry, "k8s-sample-admission-webhook", "1.10v2", true} - APIServer = ImageConfig{e2eRegistry, "k8s-aggregator-sample-apiserver", "1.7v2", true} + AdmissionWebhook = ImageConfig{e2eRegistry, "webhook", "1.10v2", false} + APIServer = ImageConfig{e2eRegistry, "sample-apiserver", "1.0", false} AppArmorLoader = ImageConfig{gcRegistry, "apparmor-loader", "0.1", false} BusyBox = ImageConfig{gcRegistry, "busybox", "1.24", false} CheckMetadataConcealment = ImageConfig{gcRegistry, "check-metadata-concealment", "v0.0.3", false} - ClusterTester = ImageConfig{e2eRegistry, "clusterapi-tester", "1.0", true} - CudaVectorAdd = ImageConfig{e2eRegistry, "cuda-vector-add", "1.0", true} - Dnsutils = ImageConfig{e2eRegistry, "dnsutils", "1.0", true} + ClusterTester = ImageConfig{e2eRegistry, "clusterapi-tester", "1.0", false} + CudaVectorAdd = ImageConfig{e2eRegistry, "cuda-vector-add", "1.0", 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} - EntrypointTester = ImageConfig{e2eRegistry, "entrypoint-tester", "1.0", true} + EntrypointTester = ImageConfig{e2eRegistry, "entrypoint-tester", "1.0", false} E2ENet = ImageConfig{gcRegistry, "e2e-net", "1.0", true} - Fakegitserver = ImageConfig{e2eRegistry, "fakegitserver", "1.0", true} - GBFrontend = ImageConfig{sampleRegistry, "gb-frontend", "v5", true} - GBRedisSlave = ImageConfig{sampleRegistry, "gb-redisslave", "v2", true} - Goproxy = ImageConfig{e2eRegistry, "goproxy", "1.0", true} - Hostexec = ImageConfig{e2eRegistry, "hostexec", "1.1", true} - IpcUtils = ImageConfig{e2eRegistry, "ipc-utils", "1.0", true} - Iperf = ImageConfig{e2eRegistry, "iperf", "1.0", true} - JessieDnsutils = ImageConfig{e2eRegistry, "jessie-dnsutils", "1.0", true} - Kitten = ImageConfig{e2eRegistry, "kitten", "1.0", true} - Liveness = ImageConfig{e2eRegistry, "liveness", "1.0", true} - LogsGenerator = ImageConfig{e2eRegistry, "logs-generator", "1.0", true} - Mounttest = ImageConfig{e2eRegistry, "mounttest", "1.0", true} - MounttestUser = ImageConfig{e2eRegistry, "mounttest-user", "1.0", true} - Nautilus = ImageConfig{e2eRegistry, "nautilus", "1.0", true} - Net = ImageConfig{e2eRegistry, "net", "1.0", true} - Netexec = ImageConfig{e2eRegistry, "netexec", "1.0", true} - Nettest = ImageConfig{e2eRegistry, "nettest", "1.0", true} + Fakegitserver = ImageConfig{e2eRegistry, "fakegitserver", "1.0", false} + GBFrontend = ImageConfig{sampleRegistry, "gb-frontend", "v5", false} + GBRedisSlave = ImageConfig{sampleRegistry, "gb-redisslave", "v2", false} + Goproxy = ImageConfig{e2eRegistry, "goproxy", "1.0", false} + Hostexec = ImageConfig{e2eRegistry, "hostexec", "1.1", false} + IpcUtils = ImageConfig{e2eRegistry, "ipc-utils", "1.0", false} + Iperf = ImageConfig{e2eRegistry, "iperf", "1.0", false} + JessieDnsutils = ImageConfig{e2eRegistry, "jessie-dnsutils", "1.0", false} + Kitten = ImageConfig{e2eRegistry, "kitten", "1.0", false} + Liveness = ImageConfig{e2eRegistry, "liveness", "1.0", false} + LogsGenerator = ImageConfig{e2eRegistry, "logs-generator", "1.0", false} + Mounttest = ImageConfig{e2eRegistry, "mounttest", "1.0", false} + MounttestUser = ImageConfig{e2eRegistry, "mounttest-user", "1.0", false} + Nautilus = ImageConfig{e2eRegistry, "nautilus", "1.0", false} + Net = ImageConfig{e2eRegistry, "net", "1.0", false} + Netexec = ImageConfig{e2eRegistry, "netexec", "1.0", false} + Nettest = ImageConfig{e2eRegistry, "nettest", "1.0", false} NginxSlim = ImageConfig{gcRegistry, "nginx-slim", "0.20", true} NginxSlimNew = ImageConfig{gcRegistry, "nginx-slim", "0.21", true} - Nonewprivs = ImageConfig{e2eRegistry, "nonewprivs", "1.0", true} - NoSnatTest = ImageConfig{e2eRegistry, "no-snat-test", "1.0", true} - NoSnatTestProxy = ImageConfig{e2eRegistry, "no-snat-test-proxy", "1.0", true} - NWayHTTP = ImageConfig{e2eRegistry, "n-way-http", "1.0", true} + Nonewprivs = ImageConfig{e2eRegistry, "nonewprivs", "1.0", false} + NoSnatTest = ImageConfig{e2eRegistry, "no-snat-test", "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 Pause = ImageConfig{gcRegistry, "pause", "3.1", false} - Porter = ImageConfig{e2eRegistry, "porter", "1.0", true} - PortForwardTester = ImageConfig{e2eRegistry, "port-forward-tester", "1.0", true} - Redis = ImageConfig{e2eRegistry, "redis", "1.0", true} - ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.3", true} - ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0", true} + Porter = ImageConfig{e2eRegistry, "porter", "1.0", false} + PortForwardTester = ImageConfig{e2eRegistry, "port-forward-tester", "1.0", false} + Redis = ImageConfig{e2eRegistry, "redis", "1.0", false} + ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.3", 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.0", true} - TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0", true} + ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.1", false} + TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0", false} VolumeNFSServer = ImageConfig{e2eRegistry, "volume-nfs", "0.8", false} VolumeISCSIServer = ImageConfig{e2eRegistry, "volume-iscsi", "0.2", false} VolumeGlusterServer = ImageConfig{e2eRegistry, "volume-gluster", "0.5", false}