mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #20837 from yujuhong/pull_images
e2e: use the tagged busybox image to avoid unnecessary pulling
This commit is contained in:
commit
242000d790
@ -62,7 +62,7 @@ var _ = Describe("ConfigMap", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "env-test",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"sh", "-c", "env"},
|
||||
Env: []api.EnvVar{
|
||||
{
|
||||
|
@ -91,7 +91,7 @@ func testDownwardAPI(framework *Framework, podName string, env []api.EnvVar, exp
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "dapi-container",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"sh", "-c", "env"},
|
||||
Env: env,
|
||||
},
|
||||
|
@ -37,7 +37,7 @@ var _ = Describe("Variable Expansion", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "dapi-container",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"sh", "-c", "env"},
|
||||
Env: []api.EnvVar{
|
||||
{
|
||||
@ -77,7 +77,7 @@ var _ = Describe("Variable Expansion", func() {
|
||||
Containers: []api.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)\""},
|
||||
Env: []api.EnvVar{
|
||||
{
|
||||
@ -107,7 +107,7 @@ var _ = Describe("Variable Expansion", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "dapi-container",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"sh", "-c"},
|
||||
Args: []string{"TEST_VAR=wrong echo \"$(TEST_VAR)\""},
|
||||
Env: []api.EnvVar{
|
||||
|
@ -73,7 +73,7 @@ func createTerminatingPod(f *Framework) (*api.Pod, error) {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: string(uuid),
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -223,7 +223,7 @@ func newTestJob(behavior, name string, rPol api.RestartPolicy, parallelism, comp
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "c",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{},
|
||||
VolumeMounts: []api.VolumeMount{
|
||||
{
|
||||
|
@ -64,7 +64,7 @@ var _ = Describe("Networking", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: contName,
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"wget", "-s", "google.com"},
|
||||
},
|
||||
},
|
||||
|
@ -396,7 +396,7 @@ func testPDPod(diskNames []string, targetHost string, readOnly bool, numContaine
|
||||
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"}
|
||||
|
||||
|
@ -162,7 +162,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "scrub-checker",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"/bin/sh"},
|
||||
Args: []string{"-c", "test ! -e /mnt/index.html || exit 1"},
|
||||
VolumeMounts: []api.VolumeMount{
|
||||
|
@ -618,7 +618,7 @@ var _ = Describe("Pods", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "env3cont",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"sh", "-c", "env"},
|
||||
},
|
||||
},
|
||||
@ -647,7 +647,7 @@ var _ = Describe("Pods", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
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"},
|
||||
LivenessProbe: &api.Probe{
|
||||
Handler: api.Handler{
|
||||
@ -674,7 +674,7 @@ var _ = Describe("Pods", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
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"},
|
||||
LivenessProbe: &api.Probe{
|
||||
Handler: api.Handler{
|
||||
@ -800,7 +800,7 @@ var _ = Describe("Pods", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
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"},
|
||||
},
|
||||
},
|
||||
@ -879,7 +879,7 @@ var _ = Describe("Pods", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
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"},
|
||||
},
|
||||
},
|
||||
@ -944,7 +944,7 @@ var _ = Describe("Pods", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
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"},
|
||||
},
|
||||
},
|
||||
@ -995,7 +995,7 @@ var _ = Describe("Pods", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
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"},
|
||||
LivenessProbe: &api.Probe{
|
||||
Handler: api.Handler{
|
||||
@ -1036,7 +1036,7 @@ var _ = Describe("Pods", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
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"},
|
||||
},
|
||||
},
|
||||
|
@ -76,7 +76,7 @@ func testPreStop(c *client.Client, ns string) {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "tester",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"sleep", "600"},
|
||||
Lifecycle: &api.Lifecycle{
|
||||
PreStop: &api.Handler{
|
||||
|
@ -131,7 +131,7 @@ var _ = Describe("Secrets", func() {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "secret-env-test",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"sh", "-c", "env"},
|
||||
Env: []api.EnvVar{
|
||||
{
|
||||
|
@ -47,7 +47,7 @@ func scTestPod(hostIPC bool, hostPID bool) *api.Pod {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "test-container",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
},
|
||||
},
|
||||
RestartPolicy: api.RestartPolicyNever,
|
||||
|
@ -1031,7 +1031,7 @@ func createExecPodOrFail(c *client.Client, ns, name string) {
|
||||
Containers: []api.Container{
|
||||
{
|
||||
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"},
|
||||
},
|
||||
},
|
||||
|
@ -293,7 +293,7 @@ func injectHtml(client *client.Client, config VolumeTestConfig, volume api.Volum
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: config.prefix + "-injector",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "gcr.io/google_containers/busybox:1.24",
|
||||
Command: []string{"/bin/sh"},
|
||||
Args: []string{"-c", "echo '" + content + "' > /mnt/index.html && chmod o+rX /mnt /mnt/index.html"},
|
||||
VolumeMounts: []api.VolumeMount{
|
||||
|
Loading…
Reference in New Issue
Block a user