From 7f62dd2e7962a14480c9dbe585b25d78a2bff0e8 Mon Sep 17 00:00:00 2001 From: Ashley Gau Date: Tue, 27 Mar 2018 11:32:20 -0700 Subject: [PATCH] use echoserver 1.10 --- cluster/gce/manifests/e2e-image-puller.manifest | 2 +- test/e2e/framework/ingress_utils.go | 2 +- test/e2e/network/scale/ingress.go | 2 +- test/e2e/testing-manifests/ingress/http/rc.yaml | 2 +- test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml | 2 +- test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml | 2 +- test/e2e/testing-manifests/ingress/static-ip/rc.yaml | 2 +- test/utils/image/manifest.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cluster/gce/manifests/e2e-image-puller.manifest b/cluster/gce/manifests/e2e-image-puller.manifest index 03515582587..1391897989e 100644 --- a/cluster/gce/manifests/e2e-image-puller.manifest +++ b/cluster/gce/manifests/e2e-image-puller.manifest @@ -34,7 +34,7 @@ spec: k8s.gcr.io/busybox:1.24 k8s.gcr.io/dnsutils:e2e k8s.gcr.io/e2e-net-amd64:1.0 - k8s.gcr.io/echoserver:1.6 + k8s.gcr.io/echoserver:1.10 k8s.gcr.io/eptest:0.1 k8s.gcr.io/fakegitserver:0.1 k8s.gcr.io/galera-install:0.1 diff --git a/test/e2e/framework/ingress_utils.go b/test/e2e/framework/ingress_utils.go index b675154821c..2339632f43c 100644 --- a/test/e2e/framework/ingress_utils.go +++ b/test/e2e/framework/ingress_utils.go @@ -1612,7 +1612,7 @@ func generateBacksideHTTPSDeploymentSpec() *extensions.Deployment { Containers: []v1.Container{ { Name: "echoheaders-https", - Image: "k8s.gcr.io/echoserver:1.9", + Image: "k8s.gcr.io/echoserver:1.10", Ports: []v1.ContainerPort{{ ContainerPort: 8443, Name: "echo-443", diff --git a/test/e2e/network/scale/ingress.go b/test/e2e/network/scale/ingress.go index 9762b7a2c7e..ce89056fae8 100644 --- a/test/e2e/network/scale/ingress.go +++ b/test/e2e/network/scale/ingress.go @@ -440,7 +440,7 @@ func generateScaleTestBackendDeploymentSpec(numReplicas int32) *extensions.Deplo Containers: []v1.Container{ { Name: scaleTestBackendName, - Image: "gcr.io/google_containers/echoserver:1.6", + Image: "gcr.io/google_containers/echoserver:1.10", Ports: []v1.ContainerPort{{ContainerPort: 8080}}, ReadinessProbe: &v1.Probe{ Handler: v1.Handler{ diff --git a/test/e2e/testing-manifests/ingress/http/rc.yaml b/test/e2e/testing-manifests/ingress/http/rc.yaml index a4bcd5e3959..e5522b696a5 100644 --- a/test/e2e/testing-manifests/ingress/http/rc.yaml +++ b/test/e2e/testing-manifests/ingress/http/rc.yaml @@ -11,7 +11,7 @@ spec: spec: containers: - name: echoheaders - image: k8s.gcr.io/echoserver:1.6 + image: k8s.gcr.io/echoserver:1.10 ports: - containerPort: 8080 readinessProbe: diff --git a/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml b/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml index abf9b036edd..79e2bfb0259 100644 --- a/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml +++ b/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: gcr.io/google_containers/echoserver:1.6 + image: gcr.io/google_containers/echoserver:1.10 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml b/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml index 391ad674448..6bef004eddc 100644 --- a/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml +++ b/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: k8s.gcr.io/echoserver:1.6 + image: k8s.gcr.io/echoserver:1.10 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml index 391ad674448..6bef004eddc 100644 --- a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml +++ b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: k8s.gcr.io/echoserver:1.6 + image: k8s.gcr.io/echoserver:1.10 ports: - containerPort: 8080 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 56f4854c653..b1d0408a281 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -57,7 +57,7 @@ var ( CudaVectorAdd = ImageConfig{e2eRegistry, "cuda-vector-add", "1.0", true} Dnsutils = ImageConfig{e2eRegistry, "dnsutils", "1.0", true} DNSMasq = ImageConfig{gcRegistry, "k8s-dns-dnsmasq", "1.14.5", true} - EchoServer = ImageConfig{gcRegistry, "echoserver", "1.6", false} + EchoServer = ImageConfig{gcRegistry, "echoserver", "1.10", false} EntrypointTester = ImageConfig{e2eRegistry, "entrypoint-tester", "1.0", true} E2ENet = ImageConfig{gcRegistry, "e2e-net", "1.0", true} Fakegitserver = ImageConfig{e2eRegistry, "fakegitserver", "1.0", true}