Skip to content

K
k3s
Commit 242000d7 authored by Dawn Chen's avatar Dawn Chen
Browse files
Options

Merge pull request #20837 from yujuhong/pull_images

e2e: use the tagged busybox image to avoid unnecessary pulling
parents c2f02996 4544575e
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
test/e2e/configmap.go
View file @ 242000d7
...@@ -62,7 +62,7 @@ var _ = Describe("ConfigMap", func() { ...@@ -62,7 +62,7 @@ var _ = Describe("ConfigMap", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "env-test", Name: "env-test",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sh", "-c", "env"}, Command: []string{"sh", "-c", "env"},
Env: []api.EnvVar{ Env: []api.EnvVar{
{ {
......
test/e2e/downward_api.go
View file @ 242000d7
...@@ -91,7 +91,7 @@ func testDownwardAPI(framework *Framework, podName string, env []api.EnvVar, exp ...@@ -91,7 +91,7 @@ func testDownwardAPI(framework *Framework, podName string, env []api.EnvVar, exp
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "dapi-container", Name: "dapi-container",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sh", "-c", "env"}, Command: []string{"sh", "-c", "env"},
Env: env, Env: env,
}, },
......
test/e2e/expansion.go
View file @ 242000d7
...@@ -37,7 +37,7 @@ var _ = Describe("Variable Expansion", func() { ...@@ -37,7 +37,7 @@ var _ = Describe("Variable Expansion", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "dapi-container", Name: "dapi-container",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sh", "-c", "env"}, Command: []string{"sh", "-c", "env"},
Env: []api.EnvVar{ Env: []api.EnvVar{
{ {
...@@ -77,7 +77,7 @@ var _ = Describe("Variable Expansion", func() { ...@@ -77,7 +77,7 @@ var _ = Describe("Variable Expansion", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "dapi-container", Name: "dapi-container",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sh", "-c", "TEST_VAR=wrong echo \"$(TEST_VAR)\""}, Command: []string{"sh", "-c", "TEST_VAR=wrong echo \"$(TEST_VAR)\""},
Env: []api.EnvVar{ Env: []api.EnvVar{
{ {
...@@ -107,7 +107,7 @@ var _ = Describe("Variable Expansion", func() { ...@@ -107,7 +107,7 @@ var _ = Describe("Variable Expansion", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "dapi-container", Name: "dapi-container",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sh", "-c"}, Command: []string{"sh", "-c"},
Args: []string{"TEST_VAR=wrong echo \"$(TEST_VAR)\""}, Args: []string{"TEST_VAR=wrong echo \"$(TEST_VAR)\""},
Env: []api.EnvVar{ Env: []api.EnvVar{
......
test/e2e/garbage_collector.go
View file @ 242000d7
...@@ -73,7 +73,7 @@ func createTerminatingPod(f *Framework) (*api.Pod, error) { ...@@ -73,7 +73,7 @@ func createTerminatingPod(f *Framework) (*api.Pod, error) {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: string(uuid), Name: string(uuid),
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
}, },
}, },
}, },
......
test/e2e/job.go
View file @ 242000d7
...@@ -223,7 +223,7 @@ func newTestJob(behavior, name string, rPol api.RestartPolicy, parallelism, comp ...@@ -223,7 +223,7 @@ func newTestJob(behavior, name string, rPol api.RestartPolicy, parallelism, comp
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "c", Name: "c",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{}, Command: []string{},
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{
{ {
......
test/e2e/networking.go
View file @ 242000d7
...@@ -64,7 +64,7 @@ var _ = Describe("Networking", func() { ...@@ -64,7 +64,7 @@ var _ = Describe("Networking", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: contName, Name: contName,
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"wget", "-s", "google.com"}, Command: []string{"wget", "-s", "google.com"},
}, },
}, },
......
test/e2e/pd.go
View file @ 242000d7
...@@ -396,7 +396,7 @@ func testPDPod(diskNames []string, targetHost string, readOnly bool, numContaine ...@@ -396,7 +396,7 @@ func testPDPod(diskNames []string, targetHost string, readOnly bool, numContaine
containers[i].Name = fmt.Sprintf("mycontainer%v", i+1) containers[i].Name = fmt.Sprintf("mycontainer%v", i+1)
} }
containers[i].Image = "gcr.io/google_containers/busybox" containers[i].Image = "gcr.io/google_containers/busybox:1.24"
containers[i].Command = []string{"sleep", "6000"} containers[i].Command = []string{"sleep", "6000"}
......
test/e2e/persistent_volumes.go
View file @ 242000d7
...@@ -162,7 +162,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod { ...@@ -162,7 +162,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "scrub-checker", Name: "scrub-checker",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh"}, Command: []string{"/bin/sh"},
Args: []string{"-c", "test ! -e /mnt/index.html || exit 1"}, Args: []string{"-c", "test ! -e /mnt/index.html || exit 1"},
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{
......
test/e2e/pods.go
View file @ 242000d7
...@@ -618,7 +618,7 @@ var _ = Describe("Pods", func() { ...@@ -618,7 +618,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "env3cont", Name: "env3cont",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sh", "-c", "env"}, Command: []string{"sh", "-c", "env"},
}, },
}, },
...@@ -647,7 +647,7 @@ var _ = Describe("Pods", func() { ...@@ -647,7 +647,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "liveness", Name: "liveness",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 10; rm -rf /tmp/health; sleep 600"}, Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 10; rm -rf /tmp/health; sleep 600"},
LivenessProbe: &api.Probe{ LivenessProbe: &api.Probe{
Handler: api.Handler{ Handler: api.Handler{
...@@ -674,7 +674,7 @@ var _ = Describe("Pods", func() { ...@@ -674,7 +674,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "liveness", Name: "liveness",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 600"}, Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 600"},
LivenessProbe: &api.Probe{ LivenessProbe: &api.Probe{
Handler: api.Handler{ Handler: api.Handler{
...@@ -800,7 +800,7 @@ var _ = Describe("Pods", func() { ...@@ -800,7 +800,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "main", Name: "main",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 600"}, Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 600"},
}, },
}, },
...@@ -879,7 +879,7 @@ var _ = Describe("Pods", func() { ...@@ -879,7 +879,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "main", Name: "main",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 600"}, Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 600"},
}, },
}, },
...@@ -944,7 +944,7 @@ var _ = Describe("Pods", func() { ...@@ -944,7 +944,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: containerName, Name: containerName,
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh", "-c", "sleep 5", "/crash/missing"}, Command: []string{"/bin/sh", "-c", "sleep 5", "/crash/missing"},
}, },
}, },
...@@ -995,7 +995,7 @@ var _ = Describe("Pods", func() { ...@@ -995,7 +995,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: containerName, Name: containerName,
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 5; rm -rf /tmp/health; sleep 600"}, Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 5; rm -rf /tmp/health; sleep 600"},
LivenessProbe: &api.Probe{ LivenessProbe: &api.Probe{
Handler: api.Handler{ Handler: api.Handler{
...@@ -1036,7 +1036,7 @@ var _ = Describe("Pods", func() { ...@@ -1036,7 +1036,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: containerName, Name: containerName,
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh", "-c", "sleep 5", "/crash/missing"}, Command: []string{"/bin/sh", "-c", "sleep 5", "/crash/missing"},
}, },
}, },
......
test/e2e/pre_stop.go
View file @ 242000d7
...@@ -76,7 +76,7 @@ func testPreStop(c *client.Client, ns string) { ...@@ -76,7 +76,7 @@ func testPreStop(c *client.Client, ns string) {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "tester", Name: "tester",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sleep", "600"}, Command: []string{"sleep", "600"},
Lifecycle: &api.Lifecycle{ Lifecycle: &api.Lifecycle{
PreStop: &api.Handler{ PreStop: &api.Handler{
......
test/e2e/secrets.go
View file @ 242000d7
...@@ -131,7 +131,7 @@ var _ = Describe("Secrets", func() { ...@@ -131,7 +131,7 @@ var _ = Describe("Secrets", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "secret-env-test", Name: "secret-env-test",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sh", "-c", "env"}, Command: []string{"sh", "-c", "env"},
Env: []api.EnvVar{ Env: []api.EnvVar{
{ {
......
test/e2e/security_context.go
View file @ 242000d7
...@@ -47,7 +47,7 @@ func scTestPod(hostIPC bool, hostPID bool) *api.Pod { ...@@ -47,7 +47,7 @@ func scTestPod(hostIPC bool, hostPID bool) *api.Pod {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "test-container", Name: "test-container",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
}, },
}, },
RestartPolicy: api.RestartPolicyNever, RestartPolicy: api.RestartPolicyNever,
......
test/e2e/service.go
View file @ 242000d7
...@@ -1031,7 +1031,7 @@ func createExecPodOrFail(c *client.Client, ns, name string) { ...@@ -1031,7 +1031,7 @@ func createExecPodOrFail(c *client.Client, ns, name string) {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "exec", Name: "exec",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sh", "-c", "while true; do sleep 5; done"}, Command: []string{"sh", "-c", "while true; do sleep 5; done"},
}, },
}, },
......
test/e2e/volumes.go
View file @ 242000d7
...@@ -293,7 +293,7 @@ func injectHtml(client *client.Client, config VolumeTestConfig, volume api.Volum ...@@ -293,7 +293,7 @@ func injectHtml(client *client.Client, config VolumeTestConfig, volume api.Volum
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: config.prefix + "-injector", Name: config.prefix + "-injector",
Image: "gcr.io/google_containers/busybox", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh"}, Command: []string{"/bin/sh"},
Args: []string{"-c", "echo '" + content + "' > /mnt/index.html && chmod o+rX /mnt /mnt/index.html"}, Args: []string{"-c", "echo '" + content + "' > /mnt/index.html && chmod o+rX /mnt /mnt/index.html"},
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{
......
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