Bumping k8s dependencies to 1.13
This commit is contained in:
Cheng Xing
112
vendor/k8s.io/kubernetes/test/utils/image/manifest.go
generated
vendored
112
vendor/k8s.io/kubernetes/test/utils/image/manifest.go
generated
vendored
@@ -18,21 +18,20 @@ package image
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"runtime"
|
||||
)
|
||||
|
||||
const (
|
||||
e2eRegistry = "gcr.io/kubernetes-e2e-test-images"
|
||||
gcRegistry = "k8s.gcr.io"
|
||||
PrivateRegistry = "gcr.io/k8s-authenticated-test"
|
||||
sampleRegistry = "gcr.io/google-samples"
|
||||
dockerLibraryRegistry = "docker.io/library"
|
||||
e2eRegistry = "gcr.io/kubernetes-e2e-test-images"
|
||||
gcRegistry = "k8s.gcr.io"
|
||||
PrivateRegistry = "gcr.io/k8s-authenticated-test"
|
||||
sampleRegistry = "gcr.io/google-samples"
|
||||
)
|
||||
|
||||
type ImageConfig struct {
|
||||
registry string
|
||||
name string
|
||||
version string
|
||||
hasArch bool
|
||||
}
|
||||
|
||||
func (i *ImageConfig) SetRegistry(registry string) {
|
||||
@@ -48,68 +47,53 @@ 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}
|
||||
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}
|
||||
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}
|
||||
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}
|
||||
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}
|
||||
AdmissionWebhook = ImageConfig{e2eRegistry, "webhook", "1.12v2"}
|
||||
APIServer = ImageConfig{e2eRegistry, "sample-apiserver", "1.0"}
|
||||
AppArmorLoader = ImageConfig{e2eRegistry, "apparmor-loader", "1.0"}
|
||||
BusyBox = ImageConfig{dockerLibraryRegistry, "busybox", "1.29"}
|
||||
CheckMetadataConcealment = ImageConfig{e2eRegistry, "metadata-concealment", "1.0"}
|
||||
CudaVectorAdd = ImageConfig{e2eRegistry, "cuda-vector-add", "1.0"}
|
||||
Dnsutils = ImageConfig{e2eRegistry, "dnsutils", "1.1"}
|
||||
EchoServer = ImageConfig{e2eRegistry, "echoserver", "2.2"}
|
||||
EntrypointTester = ImageConfig{e2eRegistry, "entrypoint-tester", "1.0"}
|
||||
Fakegitserver = ImageConfig{e2eRegistry, "fakegitserver", "1.0"}
|
||||
GBFrontend = ImageConfig{sampleRegistry, "gb-frontend", "v6"}
|
||||
GBRedisSlave = ImageConfig{sampleRegistry, "gb-redisslave", "v3"}
|
||||
Hostexec = ImageConfig{e2eRegistry, "hostexec", "1.1"}
|
||||
IpcUtils = ImageConfig{e2eRegistry, "ipc-utils", "1.0"}
|
||||
Iperf = ImageConfig{e2eRegistry, "iperf", "1.0"}
|
||||
JessieDnsutils = ImageConfig{e2eRegistry, "jessie-dnsutils", "1.0"}
|
||||
Kitten = ImageConfig{e2eRegistry, "kitten", "1.0"}
|
||||
Liveness = ImageConfig{e2eRegistry, "liveness", "1.0"}
|
||||
LogsGenerator = ImageConfig{e2eRegistry, "logs-generator", "1.0"}
|
||||
Mounttest = ImageConfig{e2eRegistry, "mounttest", "1.0"}
|
||||
MounttestUser = ImageConfig{e2eRegistry, "mounttest-user", "1.0"}
|
||||
Nautilus = ImageConfig{e2eRegistry, "nautilus", "1.0"}
|
||||
Net = ImageConfig{e2eRegistry, "net", "1.0"}
|
||||
Netexec = ImageConfig{e2eRegistry, "netexec", "1.0"}
|
||||
Nettest = ImageConfig{e2eRegistry, "nettest", "1.0"}
|
||||
Nginx = ImageConfig{dockerLibraryRegistry, "nginx", "1.14-alpine"}
|
||||
NginxNew = ImageConfig{dockerLibraryRegistry, "nginx", "1.15-alpine"}
|
||||
Nonewprivs = ImageConfig{e2eRegistry, "nonewprivs", "1.0"}
|
||||
NoSnatTest = ImageConfig{e2eRegistry, "no-snat-test", "1.0"}
|
||||
NoSnatTestProxy = ImageConfig{e2eRegistry, "no-snat-test-proxy", "1.0"}
|
||||
// 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}
|
||||
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}
|
||||
VolumeNFSServer = ImageConfig{e2eRegistry, "volume-nfs", "0.8", false}
|
||||
VolumeISCSIServer = ImageConfig{e2eRegistry, "volume-iscsi", "0.2", false}
|
||||
VolumeGlusterServer = ImageConfig{e2eRegistry, "volume-gluster", "0.5", false}
|
||||
VolumeRBDServer = ImageConfig{e2eRegistry, "volume-rbd", "0.2", false}
|
||||
Pause = ImageConfig{gcRegistry, "pause", "3.1"}
|
||||
Porter = ImageConfig{e2eRegistry, "porter", "1.0"}
|
||||
PortForwardTester = ImageConfig{e2eRegistry, "port-forward-tester", "1.0"}
|
||||
Redis = ImageConfig{e2eRegistry, "redis", "1.0"}
|
||||
ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.3"}
|
||||
ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0"}
|
||||
ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.1"}
|
||||
TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0"}
|
||||
VolumeNFSServer = ImageConfig{e2eRegistry, "volume/nfs", "1.0"}
|
||||
VolumeISCSIServer = ImageConfig{e2eRegistry, "volume/iscsi", "1.0"}
|
||||
VolumeGlusterServer = ImageConfig{e2eRegistry, "volume/gluster", "1.0"}
|
||||
VolumeRBDServer = ImageConfig{e2eRegistry, "volume/rbd", "1.0.1"}
|
||||
)
|
||||
|
||||
func GetE2EImage(image ImageConfig) string {
|
||||
return GetE2EImageWithArch(image, runtime.GOARCH)
|
||||
}
|
||||
|
||||
func GetE2EImageWithArch(image ImageConfig, arch string) string {
|
||||
if image.hasArch {
|
||||
return fmt.Sprintf("%s/%s-%s:%s", image.registry, image.name, arch, image.version)
|
||||
} else {
|
||||
return fmt.Sprintf("%s/%s:%s", image.registry, image.name, image.version)
|
||||
|
||||
}
|
||||
return fmt.Sprintf("%s/%s:%s", image.registry, image.name, image.version)
|
||||
}
|
||||
|
||||
// GetPauseImageName returns the pause image name with proper version
|
||||
|
||||
Reference in New Issue
Block a user