From 048247866552e18797bb8afe313dbeca0ffe6418 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 21 Dec 2021 11:58:24 -0800 Subject: [PATCH] use minikube's own busybox image --- test/integration/addons_test.go | 2 +- test/integration/preload_test.go | 2 +- test/integration/testdata/build/Dockerfile | 2 +- test/integration/testdata/busybox-mount-test.yaml | 2 +- test/integration/testdata/busybox.yaml | 2 +- .../integration/testdata/multinodes/multinode-pod-dns-test.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index b3983ecb5d..6d421c6aa8 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -293,7 +293,7 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) { t.Logf("pre-cleanup %s failed: %v (not a problem)", rr.Command(), err) } - rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "registry-test", "--restart=Never", "--image=busybox", "-it", "--", "sh", "-c", "wget --spider -S http://registry.kube-system.svc.cluster.local")) + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "registry-test", "--restart=Never", "--image=gcr.io/k8s-minikube/busybox", "-it", "--", "sh", "-c", "wget --spider -S http://registry.kube-system.svc.cluster.local")) if err != nil { t.Errorf("failed to hit registry.kube-system.svc.cluster.local. args %q failed: %v", rr.Command(), err) } diff --git a/test/integration/preload_test.go b/test/integration/preload_test.go index 6ce94bfbc5..c7734d75f6 100644 --- a/test/integration/preload_test.go +++ b/test/integration/preload_test.go @@ -52,7 +52,7 @@ func TestPreload(t *testing.T) { } // Now, pull the busybox image into minikube - image := "busybox" + image := "gcr.io/k8s-minikube/busybox" var cmd *exec.Cmd if ContainerRuntime() == "docker" { cmd = exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "pull", image) diff --git a/test/integration/testdata/build/Dockerfile b/test/integration/testdata/build/Dockerfile index dfe60cebfa..f37a113ccc 100644 --- a/test/integration/testdata/build/Dockerfile +++ b/test/integration/testdata/build/Dockerfile @@ -1,3 +1,3 @@ -FROM busybox +FROM gcr.io/k8s-minikube/busybox RUN true ADD content.txt / diff --git a/test/integration/testdata/busybox-mount-test.yaml b/test/integration/testdata/busybox-mount-test.yaml index 787c0797bd..ac14f4b71c 100644 --- a/test/integration/testdata/busybox-mount-test.yaml +++ b/test/integration/testdata/busybox-mount-test.yaml @@ -9,7 +9,7 @@ spec: restartPolicy: Never containers: - name: mount-munger - image: busybox:1.28.4-glibc + image: gcr.io/k8s-minikube/busybox:1.28.4-glibc command: ["/bin/sh", "-c", "--"] args: - cat /mount-9p/created-by-test; diff --git a/test/integration/testdata/busybox.yaml b/test/integration/testdata/busybox.yaml index b057afe0b7..ed163828b7 100644 --- a/test/integration/testdata/busybox.yaml +++ b/test/integration/testdata/busybox.yaml @@ -6,7 +6,7 @@ metadata: integration-test: busybox spec: containers: - - image: busybox:1.28.4-glibc + - image: gcr.io/k8s-minikube/busybox:1.28.4-glibc command: - sleep - "3600" diff --git a/test/integration/testdata/multinodes/multinode-pod-dns-test.yaml b/test/integration/testdata/multinodes/multinode-pod-dns-test.yaml index b0b5d1779f..c778c28d04 100644 --- a/test/integration/testdata/multinodes/multinode-pod-dns-test.yaml +++ b/test/integration/testdata/multinodes/multinode-pod-dns-test.yaml @@ -20,7 +20,7 @@ spec: # https://github.com/docker-library/busybox/issues/48 # note: k8s.gcr.io/e2e-test-images/agnhost:2.32 # has similar issues (ie, resolves but returns exit code 1) - image: busybox:1.28 + image: gcr.io/k8s-minikube/busybox:1.28 command: - sleep - "3600"