diff --git a/test/e2e/addon_update.go b/test/e2e/addon_update.go index 70bff438dc4..e425b6ff54f 100644 --- a/test/e2e/addon_update.go +++ b/test/e2e/addon_update.go @@ -57,7 +57,7 @@ spec: kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/serve_hostname:1.1 + - image: gcr.io/google_containers/serve_hostname:v1.4 name: addon-test ports: - containerPort: 9376 @@ -87,7 +87,7 @@ spec: kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/serve_hostname:1.1 + - image: gcr.io/google_containers/serve_hostname:v1.4 name: addon-test ports: - containerPort: 9376 @@ -155,7 +155,7 @@ spec: kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/serve_hostname:1.1 + - image: gcr.io/google_containers/serve_hostname:v1.4 name: invalid-addon-test ports: - containerPort: 9376 diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index 76114b8f29f..72c9056c2d2 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -73,7 +73,7 @@ var _ = KubeDescribe("Daemon set [Serial]", func() { f = NewDefaultFramework("daemonsets") - image := "gcr.io/google_containers/serve_hostname:1.1" + image := "gcr.io/google_containers/serve_hostname:v1.4" dsName := "daemon-set" var ns string diff --git a/test/e2e/etcd_failure.go b/test/e2e/etcd_failure.go index 1a9e6d35327..1768ac202a4 100644 --- a/test/e2e/etcd_failure.go +++ b/test/e2e/etcd_failure.go @@ -70,7 +70,7 @@ func etcdFailTest(framework *Framework, failCommand, fixCommand string) { checkExistingRCRecovers(framework) - ServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:1.1") + ServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:v1.4") } // For this duration, etcd will be failed by executing a failCommand on the master. diff --git a/test/e2e/events.go b/test/e2e/events.go index 97e75670dec..d361da0e199 100644 --- a/test/e2e/events.go +++ b/test/e2e/events.go @@ -53,7 +53,7 @@ var _ = KubeDescribe("Events", func() { Containers: []api.Container{ { Name: "p", - Image: "gcr.io/google_containers/serve_hostname:1.1", + Image: "gcr.io/google_containers/serve_hostname:v1.4", Ports: []api.ContainerPort{{ContainerPort: 80}}, }, }, diff --git a/test/e2e/load.go b/test/e2e/load.go index 0f27630b353..1645a107cff 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -97,7 +97,7 @@ var _ = KubeDescribe("Load capacity", func() { loadTests := []Load{ // The container will consume 1 cpu and 512mb of memory. {podsPerNode: 3, image: "jess/stress", command: []string{"stress", "-c", "1", "-m", "2"}}, - {podsPerNode: 30, image: "gcr.io/google_containers/serve_hostname:1.1"}, + {podsPerNode: 30, image: "gcr.io/google_containers/serve_hostname:v1.4"}, } for _, testArg := range loadTests { diff --git a/test/e2e/pods.go b/test/e2e/pods.go index 531eb788cec..a2f9a0b7d9f 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -584,7 +584,7 @@ var _ = KubeDescribe("Pods", func() { Containers: []api.Container{ { Name: "srv", - Image: "gcr.io/google_containers/serve_hostname:1.1", + Image: "gcr.io/google_containers/serve_hostname:v1.4", Ports: []api.ContainerPort{{ContainerPort: 9376}}, }, }, diff --git a/test/e2e/rc.go b/test/e2e/rc.go index 9c7257b7592..182d04513e9 100644 --- a/test/e2e/rc.go +++ b/test/e2e/rc.go @@ -33,14 +33,14 @@ var _ = KubeDescribe("ReplicationController", func() { framework := NewDefaultFramework("replication-controller") It("should serve a basic image on each replica with a public image [Conformance]", func() { - ServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:1.1") + ServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:v1.4") }) It("should serve a basic image on each replica with a private image", func() { // requires private images SkipUnlessProviderIs("gce", "gke") - ServeImageOrFail(framework, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:1.1") + ServeImageOrFail(framework, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:v1.4") }) }) diff --git a/test/e2e/replica_set.go b/test/e2e/replica_set.go index 6f69953612b..6e9a06748bd 100644 --- a/test/e2e/replica_set.go +++ b/test/e2e/replica_set.go @@ -35,14 +35,14 @@ var _ = KubeDescribe("ReplicaSet", func() { framework := NewDefaultFramework("replicaset") It("should serve a basic image on each replica with a public image [Conformance]", func() { - ReplicaSetServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:1.1") + ReplicaSetServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:v1.4") }) It("should serve a basic image on each replica with a private image", func() { // requires private images SkipUnlessProviderIs("gce", "gke") - ReplicaSetServeImageOrFail(framework, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:1.1") + ReplicaSetServeImageOrFail(framework, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:v1.4") }) }) diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 9f9e1271c78..8e3fca25e67 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -43,7 +43,7 @@ import ( ) const ( - serveHostnameImage = "gcr.io/google_containers/serve_hostname:1.1" + serveHostnameImage = "gcr.io/google_containers/serve_hostname:v1.4" resizeNodeReadyTimeout = 2 * time.Minute resizeNodeNotReadyTimeout = 2 * time.Minute nodeReadinessTimeout = 3 * time.Minute diff --git a/test/e2e/service.go b/test/e2e/service.go index c2dc6e71f34..7f997cadc06 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -1295,7 +1295,7 @@ func startServeHostnameService(c *client.Client, ns, name string, port, replicas maxContainerFailures := 0 config := RCConfig{ Client: c, - Image: "gcr.io/google_containers/serve_hostname:1.1", + Image: "gcr.io/google_containers/serve_hostname:v1.4", Name: name, Namespace: ns, PollInterval: 3 * time.Second, diff --git a/test/e2e/ubernetes_lite.go b/test/e2e/ubernetes_lite.go index 262af24465b..c31e51b5ced 100644 --- a/test/e2e/ubernetes_lite.go +++ b/test/e2e/ubernetes_lite.go @@ -35,7 +35,7 @@ var _ = KubeDescribe("Ubernetes Lite", func() { framework := NewDefaultFramework("ubernetes-lite") var zoneCount int var err error - image := "gcr.io/google_containers/serve_hostname:1.1" + image := "gcr.io/google_containers/serve_hostname:v1.4" BeforeEach(func() { if zoneCount <= 0 { zoneCount, err = getZoneCount(framework.Client) diff --git a/test/soak/cauldron/cauldron.go b/test/soak/cauldron/cauldron.go index 8d4c527641c..f5d1dc84245 100644 --- a/test/soak/cauldron/cauldron.go +++ b/test/soak/cauldron/cauldron.go @@ -177,7 +177,7 @@ func main() { Containers: []api.Container{ { Name: "serve-hostname", - Image: "gcr.io/google_containers/serve_hostname:1.1", + Image: "gcr.io/google_containers/serve_hostname:v1.4", Ports: []api.ContainerPort{{ContainerPort: 9376}}, }, }, diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index 5f7581b98e2..0e014608d96 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -200,7 +200,7 @@ func main() { Containers: []api.Container{ { Name: "serve-hostname", - Image: "gcr.io/google_containers/serve_hostname:1.1", + Image: "gcr.io/google_containers/serve_hostname:v1.4", Ports: []api.ContainerPort{{ContainerPort: 9376}}, }, },