Skip to content

K
k3s
Commit 354e6c2a authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #47683 from rmmh/echoserver

Automatic merge from submit-queue (batch tested with PRs 47626, 47674, 47683, 47290, 47688) Use echoserver:1.6 for better debugging and XSS prevention. **What this PR does / why we need it**: This updates our test code to use a newer echoserver with XSS preventions. **Which issue this PR fixes**: fixes #47682 **Special notes for your reviewer**: Marking as 1.7 since it's a fix to test code. **Release note**: ```release-note NONE ```
parents 260fcafe 783e400d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest
View file @ 354e6c2a
...@@ -27,7 +27,7 @@ spec: ...@@ -27,7 +27,7 @@ spec:
command: command:
- /bin/sh - /bin/sh
- -c - -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: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts:
......
test/e2e/disruption.go
View file @ 354e6c2a
...@@ -257,7 +257,7 @@ func createPodsOrDie(cs *kubernetes.Clientset, ns string, n int) { ...@@ -257,7 +257,7 @@ func createPodsOrDie(cs *kubernetes.Clientset, ns string, n int) {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "busybox", Name: "busybox",
Image: "gcr.io/google_containers/echoserver:1.4", Image: "gcr.io/google_containers/echoserver:1.6",
}, },
}, },
RestartPolicy: v1.RestartPolicyAlways, RestartPolicy: v1.RestartPolicyAlways,
...@@ -301,7 +301,7 @@ func waitForPodsOrDie(cs *kubernetes.Clientset, ns string, n int) { ...@@ -301,7 +301,7 @@ func waitForPodsOrDie(cs *kubernetes.Clientset, ns string, n int) {
func createReplicaSetOrDie(cs *kubernetes.Clientset, ns string, size int32, exclusive bool) { func createReplicaSetOrDie(cs *kubernetes.Clientset, ns string, size int32, exclusive bool) {
container := v1.Container{ container := v1.Container{
Name: "busybox", Name: "busybox",
Image: "gcr.io/google_containers/echoserver:1.4", Image: "gcr.io/google_containers/echoserver:1.6",
} }
if exclusive { if exclusive {
container.Ports = []v1.ContainerPort{ container.Ports = []v1.ContainerPort{
......
test/e2e/framework/service_util.go
View file @ 354e6c2a
...@@ -734,7 +734,7 @@ func newEchoServerPodSpec(podName string) *v1.Pod { ...@@ -734,7 +734,7 @@ func newEchoServerPodSpec(podName string) *v1.Pod {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "echoserver", Name: "echoserver",
Image: "gcr.io/google_containers/echoserver:1.4", Image: "gcr.io/google_containers/echoserver:1.6",
Ports: []v1.ContainerPort{{ContainerPort: int32(port)}}, Ports: []v1.ContainerPort{{ContainerPort: int32(port)}},
}, },
}, },
......
test/e2e/testing-manifests/ingress/http/rc.yaml
View file @ 354e6c2a
...@@ -11,7 +11,7 @@ spec: ...@@ -11,7 +11,7 @@ spec:
spec: spec:
containers: containers:
- name: echoheaders - name: echoheaders
image: gcr.io/google_containers/echoserver:1.4 image: gcr.io/google_containers/echoserver:1.6
ports: ports:
- containerPort: 8080 - containerPort: 8080
readinessProbe: readinessProbe:
......
test/e2e/testing-manifests/ingress/static-ip/rc.yaml
View file @ 354e6c2a
...@@ -11,6 +11,6 @@ spec: ...@@ -11,6 +11,6 @@ spec:
spec: spec:
containers: containers:
- name: echoheaders-https - name: echoheaders-https
image: gcr.io/google_containers/echoserver:1.4 image: gcr.io/google_containers/echoserver:1.6
ports: ports:
- containerPort: 8080 - containerPort: 8080
test/e2e_federation/util.go
View file @ 354e6c2a
...@@ -371,7 +371,7 @@ func createBackendPodsOrFail(clusters fedframework.ClusterSlice, namespace strin ...@@ -371,7 +371,7 @@ func createBackendPodsOrFail(clusters fedframework.ClusterSlice, namespace strin
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: name, Name: name,
Image: "gcr.io/google_containers/echoserver:1.4", Image: "gcr.io/google_containers/echoserver:1.6",
}, },
}, },
RestartPolicy: v1.RestartPolicyAlways, RestartPolicy: v1.RestartPolicyAlways,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment