From de1e1ad045ce32c1aaea6533fc6726c209a334b4 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Tue, 26 Feb 2019 13:47:45 -0800 Subject: [PATCH] tests: Adds configurable registry for etcd image The image ``quay.io/coreos/etcd:v3.3.10`` does not have Windows support and Windows Containers cannot be spawned using it. Makes the etcd image's registry configurable, so the tests can be configured to use a registry which has Windows support. --- test/e2e/apimachinery/aggregator.go | 2 +- test/utils/image/manifest.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index 1f1cbca031..b6e92cb021 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -180,7 +180,7 @@ func TestSampleAPIServer(f *framework.Framework, image string) { // kubectl create -f deploy.yaml deploymentName := "sample-apiserver-deployment" - etcdImage := "quay.io/coreos/etcd:v3.3.10" + etcdImage := imageutils.GetE2EImage(imageutils.Etcd) podLabels := map[string]string{"app": "sample-apiserver", "apiserver": "true"} replicas := int32(1) zero := int64(0) diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index a4ac5dfcd3..a01912f321 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -28,6 +28,7 @@ import ( type RegistryList struct { DockerLibraryRegistry string `yaml:"dockerLibraryRegistry"` E2eRegistry string `yaml:"e2eRegistry"` + EtcdRegistry string `yaml:"etcdRegistry"` GcRegistry string `yaml:"gcRegistry"` PrivateRegistry string `yaml:"privateRegistry"` SampleRegistry string `yaml:"sampleRegistry"` @@ -59,6 +60,7 @@ func initReg() RegistryList { registry := RegistryList{ DockerLibraryRegistry: "docker.io/library", E2eRegistry: "gcr.io/kubernetes-e2e-test-images", + EtcdRegistry: "quay.io/coreos", GcRegistry: "k8s.gcr.io", PrivateRegistry: "gcr.io/k8s-authenticated-test", SampleRegistry: "gcr.io/google-samples", @@ -84,6 +86,7 @@ var ( registry = initReg() dockerLibraryRegistry = registry.DockerLibraryRegistry e2eRegistry = registry.E2eRegistry + etcdRegistry = registry.EtcdRegistry gcRegistry = registry.GcRegistry // PrivateRegistry is an image repository that requires authentication PrivateRegistry = registry.PrivateRegistry @@ -103,6 +106,7 @@ var ( Dnsutils = Config{e2eRegistry, "dnsutils", "1.1"} EchoServer = Config{e2eRegistry, "echoserver", "2.2"} EntrypointTester = Config{e2eRegistry, "entrypoint-tester", "1.0"} + Etcd = Config{etcdRegistry, "etcd", "v3.3.10"} Fakegitserver = Config{e2eRegistry, "fakegitserver", "1.0"} GBFrontend = Config{sampleRegistry, "gb-frontend", "v6"} GBRedisSlave = Config{sampleRegistry, "gb-redisslave", "v3"}