@@ -20,7 +20,8 @@ source "$ROOT_DIR/dev/env/scripts/lib.sh"
2020
2121function pull_to_kind() {
2222 local img=$1
23- local retry=" ${2:- 5} "
23+ local imgname=$2
24+ local retry=" ${3:- 5} "
2425 local backoff=30
2526
2627 for _ in $( seq " $retry " ) ; do
@@ -31,11 +32,17 @@ function pull_to_kind() {
3132 sleep " $backoff "
3233 done
3334
34- kind load docker-image " ${img} "
35+ docker save --platform amd64 " $img " -o " $IMG_TAR_DIR /$imgname .tar"
36+ kind load image-archive " $IMG_TAR_DIR /$imgname .tar"
3537}
3638
3739make --no-print-directory -C " $ROOT_DIR " image/build/emailsender
38- kind load docker-image " $( make --no-print-directory -C " $ROOT_DIR " image-tag/emailsender) "
40+
41+ IMG_TAR_DIR=" $( mktemp -d) "
42+
43+ EMAILSENDER_IMAGE=" $( make --silent --no-print-directory -C " $ROOT_DIR " image-tag/emailsender) "
44+ docker save --platform amd64 " $EMAILSENDER_IMAGE " -o " $IMG_TAR_DIR /emailsender.tar"
45+ kind load image-archive " $IMG_TAR_DIR /emailsender.tar"
3946
4047kubectl create ns $EMAILSENDER_NS -o yaml --dry-run=client | kubectl apply -f -
4148kubectl create ns $CENTRAL_NS -o yaml --dry-run=client | kubectl apply -f -
@@ -51,29 +58,26 @@ GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-stackrox/acs-fleet-manager}
5158log " Running for repository: $GITHUB_REPOSITORY "
5259if [ " $GITHUB_REPOSITORY " = " stackrox/stackrox" ]; then
5360 STACKROX_DIR=" $( cd " $ROOT_DIR /../stackrox" && pwd) "
54- ACS_VERSION=" $( make --no-print-directory -C " $STACKROX_DIR " tag) "
61+ ACS_VERSION=" $( make --silent -- no-print-directory -C " $STACKROX_DIR " tag) "
5562else
5663 ACS_VERSION=" $( git ls-remote --tags https://github.com/stackrox/stackrox | grep -E ' .*-nightly-[0-9]{8}$' | awk ' {print $2}' | sed ' s|refs/tags/||' | sort -V | tail -n 1) "
5764fi
5865
5966log " ACS version: $ACS_VERSION "
6067
6168IMG_REPO=" quay.io/rhacs-eng"
62- MAIN_IMG_NAME=" $IMG_REPO /main"
63- CENTRAL_DB_IMG_NAME=" $IMG_REPO /central-db"
64-
65- IMAGES_TO_PULL=(
66- " $MAIN_IMG_NAME :$ACS_VERSION "
67- " $CENTRAL_DB_IMG_NAME :$ACS_VERSION "
69+ IMG_NAMES=(
70+ " main"
71+ " central-db"
6872)
69-
73+ MAIN_IMG= " $IMG_REPO /main: $ACS_VERSION "
7074IMG_WAIT_TIMEOUT_SECONDS=" ${IMG_WAIT_TIMEOUT_SECONDS:- 1200} "
71- for img in " ${IMAGES_TO_PULL [@]} " ; do
72- wait_for_img " $img " " $IMG_WAIT_TIMEOUT_SECONDS "
73- pull_to_kind " $img "
75+ for imgname in " ${IMG_NAMES [@]} " ; do
76+ wait_for_img " $IMG_REPO / $imgname : $ACS_VERSION " " $IMG_WAIT_TIMEOUT_SECONDS "
77+ pull_to_kind " $IMG_REPO / $imgname : $ACS_VERSION " " $imgname "
7478done
7579
76- ROXCTL=" docker run --rm --user $( id -u) :$( id -g) -v $( pwd) :/tmp/stackrox-charts/ $MAIN_IMG_NAME : $ACS_VERSION "
80+ ROXCTL=" docker run --rm --user $( id -u) :$( id -g) -v $( pwd) :/tmp/stackrox-charts/ $MAIN_IMG "
7781# --remove to make this script rerunnable on a local machine
7882$ROXCTL helm output central-services --image-defaults opensource --remove --output-dir /tmp/stackrox-charts/central-chart
7983
0 commit comments