Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update serve_hostname version from 1.1 to v1.4 #23293

Merged
merged 1 commit into from
Mar 23, 2016
Merged

Update serve_hostname version from 1.1 to v1.4 #23293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/e2e/addon_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/daemon_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/etcd_failure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}},
},
},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/pods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}},
},
},
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/rc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
})

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/replica_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
})

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/resize_nodes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/ubernetes_lite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/soak/cauldron/cauldron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}},
},
},
Expand Down
2 changes: 1 addition & 1 deletion test/soak/serve_hostnames/serve_hostnames.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}},
},
},
Expand Down