e2e images pulled from gcr.io

This commit is contained in:
Jeff Lowdermilk
2015-03-31 10:25:20 -07:00
parent 506887515d
commit 2d8e93f8b4
33 changed files with 48 additions and 48 deletions

View File

@@ -218,7 +218,7 @@ var _ = Describe("Density", func() {
}
It(name, func() {
RCName = "my-hostname-density" + strconv.Itoa(count) + "-" + string(util.NewUUID())
RunRC(c, RCName, ns, "kubernetes/pause:go", count*minionCount)
RunRC(c, RCName, ns, "gcr.io/google_containers/pause:go", count*minionCount)
})
}
@@ -231,7 +231,7 @@ var _ = Describe("Density", func() {
defer wg.Done()
for i := 0; i < 10; i++ {
name := "my-hostname-thrash-" + string(util.NewUUID())
RunRC(c, name, ns, "kubernetes/pause:go", 10*minionCount)
RunRC(c, name, ns, "gcr.io/google_containers/pause:go", 10*minionCount)
}
}()
}

View File

@@ -85,7 +85,7 @@ func entrypointTestPod() *api.Pod {
Containers: []api.Container{
{
Name: testContainerName,
Image: "kubernetes/eptest:0.1",
Image: "gcr.io/google_containers/eptest:0.1",
},
},
RestartPolicy: api.RestartPolicyNever,

View File

@@ -198,7 +198,7 @@ func ClusterLevelLoggingWithElasticsearch(c *client.Client) {
Containers: []api.Container{
{
Name: "synth-logger",
Image: "ubuntu:14.04",
Image: "gcr.io/google_containers/ubuntu:14.04",
Command: []string{"bash", "-c", fmt.Sprintf("i=0; while ((i < %d)); do echo \"%d %s $i %s\"; i=$(($i+1)); done", countTo, i, taintName, podName)},
},
},

View File

@@ -64,7 +64,7 @@ var _ = Describe("Events", func() {
Containers: []api.Container{
{
Name: "p",
Image: "kubernetes/serve_hostname",
Image: "gcr.io/google_containers/serve_hostname",
Ports: []api.ContainerPort{{ContainerPort: 80}},
},
},

View File

@@ -30,8 +30,8 @@ import (
)
const (
nautilusImage = "kubernetes/update-demo:nautilus"
kittenImage = "kubernetes/update-demo:kitten"
nautilusImage = "gcr.io/google_containers/update-demo:nautilus"
kittenImage = "gcr.io/google_containers/update-demo:kitten"
updateDemoSelector = "name=update-demo"
updateDemoContainer = "update-demo"
frontendSelector = "name=frontend"

View File

@@ -116,7 +116,7 @@ var _ = Describe("Networking", func() {
Containers: []api.Container{
{
Name: "webserver",
Image: "kubernetes/nettest:1.1",
Image: "gcr.io/google_containers/nettest:1.1",
Args: []string{
"-service=" + name,
fmt.Sprintf("-peers=%d", peers),

View File

@@ -212,7 +212,7 @@ func testPDPod(diskName, targetHost string, readOnly bool) *api.Pod {
Containers: []api.Container{
{
Name: "testpd",
Image: "kubernetes/pause",
Image: "gcr.io/google_containers/pause",
VolumeMounts: []api.VolumeMount{
{
Name: "testpd",

View File

@@ -107,7 +107,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "nginx",
Image: "dockerfile/nginx",
Image: "gcr.io/google_containers/nginx",
Ports: []api.ContainerPort{{ContainerPort: 80}},
LivenessProbe: &api.Probe{
Handler: api.Handler{
@@ -207,7 +207,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "nginx",
Image: "dockerfile/nginx",
Image: "gcr.io/google_containers/nginx",
Ports: []api.ContainerPort{{ContainerPort: 80}},
LivenessProbe: &api.Probe{
Handler: api.Handler{
@@ -277,7 +277,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "srv",
Image: "kubernetes/serve_hostname",
Image: "gcr.io/google_containers/serve_hostname",
Ports: []api.ContainerPort{{ContainerPort: 9376}},
},
},
@@ -332,7 +332,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "env3cont",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"sh", "-c", "env"},
},
},
@@ -361,7 +361,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "liveness",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 10; echo fail >/tmp/health; sleep 600"},
LivenessProbe: &api.Probe{
Handler: api.Handler{
@@ -387,7 +387,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "liveness",
Image: "kubernetes/liveness",
Image: "gcr.io/google_containers/liveness",
Command: []string{"/server"},
LivenessProbe: &api.Probe{
Handler: api.Handler{

View File

@@ -40,7 +40,7 @@ var _ = Describe("ReplicationController", func() {
})
It("should serve a basic image on each replica with a public image", func() {
ServeImageOrFail(c, "basic", "kubernetes/serve_hostname:1.1")
ServeImageOrFail(c, "basic", "gcr.io/google_containers/serve_hostname:1.1")
})
It("should serve a basic image on each replica with a private image", func() {

View File

@@ -84,7 +84,7 @@ var _ = Describe("Secrets", func() {
Containers: []api.Container{
{
Name: "catcont",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"sh", "-c", "cat /etc/secret-volume/data-1"},
VolumeMounts: []api.VolumeMount{
{

View File

@@ -91,7 +91,7 @@ var _ = Describe("Services", func() {
Containers: []api.Container{
{
Name: "webserver",
Image: "kubernetes/test-webserver",
Image: "gcr.io/google_containers/test-webserver",
VolumeMounts: []api.VolumeMount{
{
Name: "results",
@@ -101,7 +101,7 @@ var _ = Describe("Services", func() {
},
{
Name: "pinger",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"sh", "-c", probeCmd},
VolumeMounts: []api.VolumeMount{
{
@@ -306,7 +306,7 @@ var _ = Describe("Services", func() {
Containers: []api.Container{
{
Name: "webserver",
Image: "kubernetes/test-webserver",
Image: "gcr.io/google_containers/test-webserver",
},
},
},
@@ -454,7 +454,7 @@ func addEndpointPodOrFail(c *client.Client, ns, name string, labels map[string]s
Containers: []api.Container{
{
Name: "test",
Image: "kubernetes/pause",
Image: "gcr.io/google_containers/pause",
Ports: []api.ContainerPort{{ContainerPort: 80}},
},
},

View File

@@ -161,7 +161,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:1.1",
Ports: []api.ContainerPort{{ContainerPort: 9376}},
},
},