github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-21 01:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Update serve_hostname version from 1.1 to v1.4

Browse Source
This commit is contained in:
Phillip Wittrock 2016-03-21 12:53:22 -07:00
parent 2bb6f74bf9
commit f22ddf1ea8
13 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/addon_update.go
View File

@ -57,7 +57,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/serve_hostname:1.1 - image: gcr.io/google_containers/serve_hostname:v1.4
name: addon-test name: addon-test
ports: ports:
- containerPort: 9376 - containerPort: 9376
@ -87,7 +87,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/serve_hostname:1.1 - image: gcr.io/google_containers/serve_hostname:v1.4
name: addon-test name: addon-test
ports: ports:
- containerPort: 9376 - containerPort: 9376
@ -155,7 +155,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/serve_hostname:1.1 - image: gcr.io/google_containers/serve_hostname:v1.4
name: invalid-addon-test name: invalid-addon-test
ports: ports:
- containerPort: 9376 - containerPort: 9376

2
test/e2e/daemon_set.go
View File

@ -73,7 +73,7 @@ var _ = KubeDescribe("Daemon set [Serial]", func() {
f = NewDefaultFramework("daemonsets") f = NewDefaultFramework("daemonsets")
image := "gcr.io/google_containers/serve_hostname:1.1" image := "gcr.io/google_containers/serve_hostname:v1.4"
dsName := "daemon-set" dsName := "daemon-set"
var ns string var ns string

2
test/e2e/etcd_failure.go
View File

@ -70,7 +70,7 @@ func etcdFailTest(framework *Framework, failCommand, fixCommand string) {
checkExistingRCRecovers(framework) 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. // For this duration, etcd will be failed by executing a failCommand on the master.

2
test/e2e/events.go
View File

@ -53,7 +53,7 @@ var _ = KubeDescribe("Events", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "p", 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}}, Ports: []api.ContainerPort{{ContainerPort: 80}},
}, },
}, },

2
test/e2e/load.go
View File

@ -97,7 +97,7 @@ var _ = KubeDescribe("Load capacity", func() {
loadTests := []Load{ loadTests := []Load{
// The container will consume 1 cpu and 512mb of memory. // The container will consume 1 cpu and 512mb of memory.
{podsPerNode: 3, image: "jess/stress", command: []string{"stress", "-c", "1", "-m", "2"}}, {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 { for _, testArg := range loadTests {

2
test/e2e/pods.go
View File

@ -584,7 +584,7 @@ var _ = KubeDescribe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "srv", 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}}, Ports: []api.ContainerPort{{ContainerPort: 9376}},
}, },
}, },

4
test/e2e/rc.go
View File

@ -33,14 +33,14 @@ var _ = KubeDescribe("ReplicationController", func() {
framework := NewDefaultFramework("replication-controller") framework := NewDefaultFramework("replication-controller")
It("should serve a basic image on each replica with a public image [Conformance]", func() { 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() { It("should serve a basic image on each replica with a private image", func() {
// requires private images // requires private images
SkipUnlessProviderIs("gce", "gke") 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")
}) })
}) })

4
test/e2e/replica_set.go
View File

@ -35,14 +35,14 @@ var _ = KubeDescribe("ReplicaSet", func() {
framework := NewDefaultFramework("replicaset") framework := NewDefaultFramework("replicaset")
It("should serve a basic image on each replica with a public image [Conformance]", func() { 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() { It("should serve a basic image on each replica with a private image", func() {
// requires private images // requires private images
SkipUnlessProviderIs("gce", "gke") 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")
}) })
}) })

2
test/e2e/resize_nodes.go
View File

@ -43,7 +43,7 @@ import (
) )
const ( const (
serveHostnameImage = "gcr.io/google_containers/serve_hostname:1.1" serveHostnameImage = "gcr.io/google_containers/serve_hostname:v1.4"
resizeNodeReadyTimeout = 2 * time.Minute resizeNodeReadyTimeout = 2 * time.Minute
resizeNodeNotReadyTimeout = 2 * time.Minute resizeNodeNotReadyTimeout = 2 * time.Minute
nodeReadinessTimeout = 3 * time.Minute nodeReadinessTimeout = 3 * time.Minute

2
test/e2e/service.go
View File

@ -1295,7 +1295,7 @@ func startServeHostnameService(c *client.Client, ns, name string, port, replicas
maxContainerFailures := 0 maxContainerFailures := 0
config := RCConfig{ config := RCConfig{
Client: c, Client: c,
Image: "gcr.io/google_containers/serve_hostname:1.1", Image: "gcr.io/google_containers/serve_hostname:v1.4",
Name: name, Name: name,
Namespace: ns, Namespace: ns,
PollInterval: 3 * time.Second, PollInterval: 3 * time.Second,

2
test/e2e/ubernetes_lite.go
View File

@ -35,7 +35,7 @@ var _ = KubeDescribe("Ubernetes Lite", func() {
framework := NewDefaultFramework("ubernetes-lite") framework := NewDefaultFramework("ubernetes-lite")
var zoneCount int var zoneCount int
var err error var err error
image := "gcr.io/google_containers/serve_hostname:1.1" image := "gcr.io/google_containers/serve_hostname:v1.4"
BeforeEach(func() { BeforeEach(func() {
if zoneCount <= 0 { if zoneCount <= 0 {
zoneCount, err = getZoneCount(framework.Client) zoneCount, err = getZoneCount(framework.Client)

2
test/soak/cauldron/cauldron.go
View File

@ -177,7 +177,7 @@ func main() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "serve-hostname", 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}}, Ports: []api.ContainerPort{{ContainerPort: 9376}},
}, },
}, },

2
test/soak/serve_hostnames/serve_hostnames.go
View File

@ -200,7 +200,7 @@ func main() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "serve-hostname", 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}}, Ports: []api.ContainerPort{{ContainerPort: 9376}},
}, },
}, },