github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74666 from bclau/tests/configurable-etcd-image 

tests: Adds configurable registry for etcd image
pull/564/head
Kubernetes Prow Robot 2019-02-28 20:36:28 -08:00 committed by GitHub
parent ac0a946d3e de1e1ad045
commit 983cf51c53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

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

@ -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"}