From 783e400d99165f0047b1a6fa2b689a81e000b4bb Mon Sep 17 00:00:00 2001 From: Ryan Hitchman Date: Fri, 16 Jun 2017 15:47:15 -0700 Subject: [PATCH] Use echoserver:1.6 for better debugging and XSS prevention. --- .../saltbase/salt/e2e-image-puller/e2e-image-puller.manifest | 2 +- test/e2e/disruption.go | 4 ++-- test/e2e/framework/service_util.go | 2 +- test/e2e/testing-manifests/ingress/http/rc.yaml | 2 +- test/e2e/testing-manifests/ingress/static-ip/rc.yaml | 2 +- test/e2e_federation/util.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest b/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest index 75325174cafe..b6773553953a 100644 --- a/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest +++ b/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest @@ -27,7 +27,7 @@ spec: command: - /bin/sh - -c - - "for i in gcr.io/google_containers/alpine-with-bash:1.0 gcr.io/google_containers/apparmor-loader:0.1 gcr.io/google_containers/busybox:1.24 gcr.io/google_containers/dnsutils:e2e gcr.io/google_containers/e2e-net-amd64:1.0 gcr.io/google_containers/echoserver:1.4 gcr.io/google_containers/eptest:0.1 gcr.io/google_containers/fakegitserver:0.1 gcr.io/google_containers/galera-install:0.1 gcr.io/google_containers/hostexec:1.2 gcr.io/google_containers/invalid-image:invalid-tag gcr.io/google_containers/iperf:e2e gcr.io/google_containers/jessie-dnsutils:e2e gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.13.0 gcr.io/google_containers/liveness:e2e gcr.io/google_containers/logs-generator:v0.1.0 gcr.io/google_containers/mounttest:0.7 gcr.io/google_containers/mounttest:0.8 gcr.io/google_containers/mounttest-user:0.5 gcr.io/google_containers/mysql-galera:e2e gcr.io/google_containers/mysql-healthz:1.0 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.5 gcr.io/google_containers/netexec:1.7 gcr.io/google_containers/nettest:1.7 gcr.io/google_containers/nginx:1.7.9 gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.1 gcr.io/google_containers/nginx-slim:0.7 gcr.io/google_containers/nginx-slim:0.8 gcr.io/google_containers/node-problem-detector:v0.3.0 gcr.io/google_containers/pause gcr.io/google_containers/porter:4524579c0eb935c056c8e75563b4e1eda31587e0 gcr.io/google_containers/portforwardtester:1.2 gcr.io/google_containers/redis-install-3.2.0:e2e gcr.io/google_containers/resource_consumer:beta4 gcr.io/google_containers/resource_consumer/controller:beta4 gcr.io/google_containers/serve_hostname:v1.4 gcr.io/google_containers/servicelb:0.1 gcr.io/google_containers/test-webserver:e2e gcr.io/google_containers/update-demo:kitten gcr.io/google_containers/update-demo:nautilus gcr.io/google_containers/volume-ceph:0.1 gcr.io/google_containers/volume-gluster:0.2 gcr.io/google_containers/volume-iscsi:0.1 gcr.io/google_containers/volume-nfs:0.8 gcr.io/google_containers/volume-rbd:0.1 gcr.io/google_containers/zookeeper-install-3.5.0-alpha:e2e gcr.io/google_samples/gb-redisslave:nonexistent; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;" + - "for i in gcr.io/google_containers/alpine-with-bash:1.0 gcr.io/google_containers/apparmor-loader:0.1 gcr.io/google_containers/busybox:1.24 gcr.io/google_containers/dnsutils:e2e gcr.io/google_containers/e2e-net-amd64:1.0 gcr.io/google_containers/echoserver:1.6 gcr.io/google_containers/eptest:0.1 gcr.io/google_containers/fakegitserver:0.1 gcr.io/google_containers/galera-install:0.1 gcr.io/google_containers/hostexec:1.2 gcr.io/google_containers/invalid-image:invalid-tag gcr.io/google_containers/iperf:e2e gcr.io/google_containers/jessie-dnsutils:e2e gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.13.0 gcr.io/google_containers/liveness:e2e gcr.io/google_containers/logs-generator:v0.1.0 gcr.io/google_containers/mounttest:0.7 gcr.io/google_containers/mounttest:0.8 gcr.io/google_containers/mounttest-user:0.5 gcr.io/google_containers/mysql-galera:e2e gcr.io/google_containers/mysql-healthz:1.0 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.5 gcr.io/google_containers/netexec:1.7 gcr.io/google_containers/nettest:1.7 gcr.io/google_containers/nginx:1.7.9 gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.1 gcr.io/google_containers/nginx-slim:0.7 gcr.io/google_containers/nginx-slim:0.8 gcr.io/google_containers/node-problem-detector:v0.3.0 gcr.io/google_containers/pause gcr.io/google_containers/porter:4524579c0eb935c056c8e75563b4e1eda31587e0 gcr.io/google_containers/portforwardtester:1.2 gcr.io/google_containers/redis-install-3.2.0:e2e gcr.io/google_containers/resource_consumer:beta4 gcr.io/google_containers/resource_consumer/controller:beta4 gcr.io/google_containers/serve_hostname:v1.4 gcr.io/google_containers/servicelb:0.1 gcr.io/google_containers/test-webserver:e2e gcr.io/google_containers/update-demo:kitten gcr.io/google_containers/update-demo:nautilus gcr.io/google_containers/volume-ceph:0.1 gcr.io/google_containers/volume-gluster:0.2 gcr.io/google_containers/volume-iscsi:0.1 gcr.io/google_containers/volume-nfs:0.8 gcr.io/google_containers/volume-rbd:0.1 gcr.io/google_containers/zookeeper-install-3.5.0-alpha:e2e gcr.io/google_samples/gb-redisslave:nonexistent; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;" securityContext: privileged: true volumeMounts: diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go index a9ffe753260d..01f7af39fea0 100644 --- a/test/e2e/disruption.go +++ b/test/e2e/disruption.go @@ -257,7 +257,7 @@ func createPodsOrDie(cs *kubernetes.Clientset, ns string, n int) { Containers: []v1.Container{ { Name: "busybox", - Image: "gcr.io/google_containers/echoserver:1.4", + Image: "gcr.io/google_containers/echoserver:1.6", }, }, RestartPolicy: v1.RestartPolicyAlways, @@ -301,7 +301,7 @@ func waitForPodsOrDie(cs *kubernetes.Clientset, ns string, n int) { func createReplicaSetOrDie(cs *kubernetes.Clientset, ns string, size int32, exclusive bool) { container := v1.Container{ Name: "busybox", - Image: "gcr.io/google_containers/echoserver:1.4", + Image: "gcr.io/google_containers/echoserver:1.6", } if exclusive { container.Ports = []v1.ContainerPort{ diff --git a/test/e2e/framework/service_util.go b/test/e2e/framework/service_util.go index 08aa96bb0725..d79672abf3c3 100644 --- a/test/e2e/framework/service_util.go +++ b/test/e2e/framework/service_util.go @@ -734,7 +734,7 @@ func newEchoServerPodSpec(podName string) *v1.Pod { Containers: []v1.Container{ { Name: "echoserver", - Image: "gcr.io/google_containers/echoserver:1.4", + Image: "gcr.io/google_containers/echoserver:1.6", Ports: []v1.ContainerPort{{ContainerPort: int32(port)}}, }, }, diff --git a/test/e2e/testing-manifests/ingress/http/rc.yaml b/test/e2e/testing-manifests/ingress/http/rc.yaml index 3fccac0b70d2..9b7d3b624dba 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: gcr.io/google_containers/echoserver:1.4 + image: gcr.io/google_containers/echoserver:1.6 ports: - containerPort: 8080 readinessProbe: diff --git a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml index 950a3a2c5357..abf9b036edd1 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: gcr.io/google_containers/echoserver:1.4 + image: gcr.io/google_containers/echoserver:1.6 ports: - containerPort: 8080 diff --git a/test/e2e_federation/util.go b/test/e2e_federation/util.go index 7641ee2138c2..c4489a476a22 100644 --- a/test/e2e_federation/util.go +++ b/test/e2e_federation/util.go @@ -371,7 +371,7 @@ func createBackendPodsOrFail(clusters fedframework.ClusterSlice, namespace strin Containers: []v1.Container{ { Name: name, - Image: "gcr.io/google_containers/echoserver:1.4", + Image: "gcr.io/google_containers/echoserver:1.6", }, }, RestartPolicy: v1.RestartPolicyAlways,