From 175dcdb3d67dddefcd35e1f7be7cab7e3c3f3483 Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Thu, 4 Apr 2019 08:35:57 -0700 Subject: [PATCH] Use multi-arch etcd image --- test/e2e/apimachinery/aggregator.go | 3 +++ test/utils/image/manifest.go | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index b6e92cb021c..af15b813099 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -216,6 +216,9 @@ func TestSampleAPIServer(f *framework.Framework, image string) { { Name: "etcd", Image: etcdImage, + Command: []string{ + "/usr/local/bin/etcd", + }, }, } d := &apps.Deployment{ diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 2f9e3b40b1d..c2eb548428f 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -28,7 +28,6 @@ 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"` @@ -60,7 +59,6 @@ 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", @@ -86,7 +84,6 @@ 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 @@ -206,7 +203,7 @@ func initImageConfigs() map[int]Config { configs[Dnsutils] = Config{e2eRegistry, "dnsutils", "1.1"} configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} configs[EntrypointTester] = Config{e2eRegistry, "entrypoint-tester", "1.0"} - configs[Etcd] = Config{etcdRegistry, "etcd", "v3.3.10"} + configs[Etcd] = Config{gcRegistry, "etcd", "3.3.10"} configs[Fakegitserver] = Config{e2eRegistry, "fakegitserver", "1.0"} configs[GBFrontend] = Config{sampleRegistry, "gb-frontend", "v6"} configs[GBRedisSlave] = Config{sampleRegistry, "gb-redisslave", "v3"}