From f940301e2f2e60079a966c6373319bd7fdeefedc Mon Sep 17 00:00:00 2001 From: David Grove Date: Wed, 15 Nov 2023 17:20:49 -0500 Subject: [PATCH] use multiarch busybox image Use quay.io/project-codeflare/busybox instead of k8s.icr.io/busybox to ensure we get proper multiarch images. --- hack/run-e2e-kind.sh | 2 +- test/e2e/util.go | 6 +++--- test/yaml/0006-aw-init-containers.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh index 0c6c8a8f..96cf83a8 100755 --- a/hack/run-e2e-kind.sh +++ b/hack/run-e2e-kind.sh @@ -34,7 +34,7 @@ export CLUSTER_CONTEXT="--name test" export IMAGE_ECHOSERVER="quay.io/project-codeflare/echo-server:1.0" export IMAGE_UBUNTU_LATEST="ubuntu:latest" export IMAGE_UBI_LATEST="registry.access.redhat.com/ubi8/ubi:latest" -export IMAGE_BUSY_BOX_LATEST="k8s.gcr.io/busybox:latest" +export IMAGE_BUSY_BOX_LATEST="quay.io/project-codeflare/busybox:latest" export KIND_OPT=${KIND_OPT:=" --config ${ROOT_DIR}/hack/e2e-kind-config.yaml"} export KA_BIN=_output/bin export WAIT_TIME="20s" diff --git a/test/e2e/util.go b/test/e2e/util.go index 363a208e..03dc2358 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -585,7 +585,7 @@ func createJobAWWithInitContainer(context *context, name string, requeuingTimeIn "initContainers": [ { "name": "job-init-container", - "image": "k8s.gcr.io/busybox:latest", + "image": "quay.io/project-codeflare/busybox:latest", "command": ["sleep", "200"], "resources": { "requests": { @@ -597,7 +597,7 @@ func createJobAWWithInitContainer(context *context, name string, requeuingTimeIn "containers": [ { "name": "job-container", - "image": "k8s.gcr.io/busybox:latest", + "image": "quay.io/project-codeflare/busybox:latest", "command": ["sleep", "10"], "resources": { "requests": { @@ -1606,7 +1606,7 @@ func createGenericDeploymentAWWithMultipleItems(context *context, name string) * "initContainers": [ { "name": "job-init-container", - "image": "k8s.gcr.io/busybox:latest", + "image": "quay.io/project-codeflare/busybox:latest", "command": ["sleep", "200"], "resources": { "requests": { diff --git a/test/yaml/0006-aw-init-containers.yaml b/test/yaml/0006-aw-init-containers.yaml index 75ed22da..012544d9 100644 --- a/test/yaml/0006-aw-init-containers.yaml +++ b/test/yaml/0006-aw-init-containers.yaml @@ -50,7 +50,7 @@ spec: restartPolicy: Never initContainers: - name: job-init-container - image: 'k8s.gcr.io/busybox:latest' + image: 'quay.io/project-codeflare/busybox:latest' imagePullPolicy: IfNotPresent command: - sh @@ -68,7 +68,7 @@ spec: memory: 300Mi containers: - name: job-container - image: 'k8s.gcr.io/busybox:latest' + image: 'quay.io/project-codeflare/busybox:latest' imagePullPolicy: IfNotPresent command: - sh