From 6b090886de11da34dc2f366d5f1919df44db3a33 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Sun, 7 Feb 2021 06:20:14 -0800 Subject: [PATCH] tests: Separate registry configuration for etcd image Current gcRegistry configuration is responsible for both etcd and pause images. We should use the upstream pause image in testing. The etcd image doesn't have Windows support yet, so we need to have a separate configuration for it. --- test/utils/image/manifest.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 5cba0b5d3e6..99c854e0f77 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -38,6 +38,7 @@ type RegistryList struct { PromoterE2eRegistry string `yaml:"promoterE2eRegistry"` BuildImageRegistry string `yaml:"buildImageRegistry"` InvalidRegistry string `yaml:"invalidRegistry"` + GcEtcdRegistry string `yaml:"gcEtcdRegistry"` GcRegistry string `yaml:"gcRegistry"` SigStorageRegistry string `yaml:"sigStorageRegistry"` GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"` @@ -78,6 +79,7 @@ func initReg() RegistryList { PromoterE2eRegistry: "k8s.gcr.io/e2e-test-images", BuildImageRegistry: "k8s.gcr.io/build-image", InvalidRegistry: "invalid.com/invalid", + GcEtcdRegistry: "k8s.gcr.io", GcRegistry: "k8s.gcr.io", SigStorageRegistry: "k8s.gcr.io/sig-storage", GcrReleaseRegistry: "gcr.io/gke-release", @@ -116,6 +118,7 @@ var ( promoterE2eRegistry = registry.PromoterE2eRegistry buildImageRegistry = registry.BuildImageRegistry gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry + gcEtcdRegistry = registry.GcRegistry gcRegistry = registry.GcRegistry sigStorageRegistry = registry.SigStorageRegistry gcrReleaseRegistry = registry.GcrReleaseRegistry @@ -230,7 +233,7 @@ func initImageConfigs() (map[int]Config, map[int]Config) { configs[CudaVectorAdd2] = Config{promoterE2eRegistry, "cuda-vector-add", "2.2"} configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "buster-v1.5.0"} configs[EchoServer] = Config{promoterE2eRegistry, "echoserver", "2.3"} - configs[Etcd] = Config{gcRegistry, "etcd", "3.4.13-0"} + configs[Etcd] = Config{gcEtcdRegistry, "etcd", "3.4.13-0"} configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"} configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"} configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"}