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

Merge pull request #76136 from mkumatag/update_etcd_repo

Browse Source 
Use multi-arch etcd image
This commit is contained in:
Kubernetes Prow Robot 2019-04-04 22:31:54 -07:00 committed by GitHub
commit c644851d31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/apimachinery/aggregator.go
View File

@ -216,6 +216,9 @@ func TestSampleAPIServer(f *framework.Framework, image string) {
{ {
Name: "etcd", Name: "etcd",
Image: etcdImage, Image: etcdImage,
Command: []string{
"/usr/local/bin/etcd",
},
}, },
} }
d := &apps.Deployment{ d := &apps.Deployment{

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

@ -28,7 +28,6 @@ import (
type RegistryList struct { type RegistryList struct {
DockerLibraryRegistry string `yaml:"dockerLibraryRegistry"` DockerLibraryRegistry string `yaml:"dockerLibraryRegistry"`
E2eRegistry string `yaml:"e2eRegistry"` E2eRegistry string `yaml:"e2eRegistry"`
EtcdRegistry string `yaml:"etcdRegistry"`
GcRegistry string `yaml:"gcRegistry"` GcRegistry string `yaml:"gcRegistry"`
PrivateRegistry string `yaml:"privateRegistry"` PrivateRegistry string `yaml:"privateRegistry"`
SampleRegistry string `yaml:"sampleRegistry"` SampleRegistry string `yaml:"sampleRegistry"`
@ -60,7 +59,6 @@ func initReg() RegistryList {
registry := RegistryList{ registry := RegistryList{
DockerLibraryRegistry: "docker.io/library", DockerLibraryRegistry: "docker.io/library",
E2eRegistry: "gcr.io/kubernetes-e2e-test-images", E2eRegistry: "gcr.io/kubernetes-e2e-test-images",
EtcdRegistry: "quay.io/coreos",
GcRegistry: "k8s.gcr.io", GcRegistry: "k8s.gcr.io",
PrivateRegistry: "gcr.io/k8s-authenticated-test", PrivateRegistry: "gcr.io/k8s-authenticated-test",
SampleRegistry: "gcr.io/google-samples", SampleRegistry: "gcr.io/google-samples",
@ -86,7 +84,6 @@ var (
registry = initReg() registry = initReg()
dockerLibraryRegistry = registry.DockerLibraryRegistry dockerLibraryRegistry = registry.DockerLibraryRegistry
e2eRegistry = registry.E2eRegistry e2eRegistry = registry.E2eRegistry
etcdRegistry = registry.EtcdRegistry
gcRegistry = registry.GcRegistry gcRegistry = registry.GcRegistry
// PrivateRegistry is an image repository that requires authentication // PrivateRegistry is an image repository that requires authentication
PrivateRegistry = registry.PrivateRegistry PrivateRegistry = registry.PrivateRegistry
@ -209,7 +206,7 @@ func initImageConfigs() map[int]Config {
configs[Dnsutils] = Config{e2eRegistry, "dnsutils", "1.1"} configs[Dnsutils] = Config{e2eRegistry, "dnsutils", "1.1"}
configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"}
configs[EntrypointTester] = Config{e2eRegistry, "entrypoint-tester", "1.0"} 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[Fakegitserver] = Config{e2eRegistry, "fakegitserver", "1.0"}
configs[GBFrontend] = Config{sampleRegistry, "gb-frontend", "v6"} configs[GBFrontend] = Config{sampleRegistry, "gb-frontend", "v6"}
configs[GBRedisSlave] = Config{sampleRegistry, "gb-redisslave", "v3"} configs[GBRedisSlave] = Config{sampleRegistry, "gb-redisslave", "v3"}