github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

tests: Separate registry configuration for etcd image

Browse Source 
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.
This commit is contained in:
Claudiu Belu 2021-02-07 06:20:14 -08:00
parent e4da82ff2c
commit 6b090886de
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/utils/image/manifest.go
View File

@ -38,6 +38,7 @@ type RegistryList struct {
PromoterE2eRegistry string `yaml:"promoterE2eRegistry"` PromoterE2eRegistry string `yaml:"promoterE2eRegistry"`
BuildImageRegistry string `yaml:"buildImageRegistry"` BuildImageRegistry string `yaml:"buildImageRegistry"`
InvalidRegistry string `yaml:"invalidRegistry"` InvalidRegistry string `yaml:"invalidRegistry"`
GcEtcdRegistry string `yaml:"gcEtcdRegistry"`
GcRegistry string `yaml:"gcRegistry"` GcRegistry string `yaml:"gcRegistry"`
SigStorageRegistry string `yaml:"sigStorageRegistry"` SigStorageRegistry string `yaml:"sigStorageRegistry"`
GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"` GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"`
@ -78,6 +79,7 @@ func initReg() RegistryList {
PromoterE2eRegistry: "k8s.gcr.io/e2e-test-images", PromoterE2eRegistry: "k8s.gcr.io/e2e-test-images",
BuildImageRegistry: "k8s.gcr.io/build-image", BuildImageRegistry: "k8s.gcr.io/build-image",
InvalidRegistry: "invalid.com/invalid", InvalidRegistry: "invalid.com/invalid",
GcEtcdRegistry: "k8s.gcr.io",
GcRegistry: "k8s.gcr.io", GcRegistry: "k8s.gcr.io",
SigStorageRegistry: "k8s.gcr.io/sig-storage", SigStorageRegistry: "k8s.gcr.io/sig-storage",
GcrReleaseRegistry: "gcr.io/gke-release", GcrReleaseRegistry: "gcr.io/gke-release",
@ -116,6 +118,7 @@ var (
promoterE2eRegistry = registry.PromoterE2eRegistry promoterE2eRegistry = registry.PromoterE2eRegistry
buildImageRegistry = registry.BuildImageRegistry buildImageRegistry = registry.BuildImageRegistry
gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry
gcEtcdRegistry = registry.GcRegistry
gcRegistry = registry.GcRegistry gcRegistry = registry.GcRegistry
sigStorageRegistry = registry.SigStorageRegistry sigStorageRegistry = registry.SigStorageRegistry
gcrReleaseRegistry = registry.GcrReleaseRegistry 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[CudaVectorAdd2] = Config{promoterE2eRegistry, "cuda-vector-add", "2.2"}
configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "buster-v1.5.0"} configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "buster-v1.5.0"}
configs[EchoServer] = Config{promoterE2eRegistry, "echoserver", "2.3"} 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[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"}
configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"} configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"}
configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"} configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"}