Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use podman cp over podman run cat/ls when fetching CSVs for Rook #2495

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions hack/source-manifests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,21 @@ function dump_rook_csv() {
rook_csv_template="rook-ceph.clusterserviceversion.yaml"
rook_crds_dir=$rook_template_dir/ceph
rook_crds_outdir="$OUTDIR_CRDS/rook"
tmp_container="rook-$(date +%S%N)"

rm -rf $ROOK_CSV
rm -rf $rook_crds_outdir
mkdir -p $rook_crds_outdir
# The actual folder will be created by the cp below but we don't want the folder to exist
rm -rf $rook_crds_outdir

crd_list=$(mktemp)
echo "Dumping rook csv using command: $IMAGE_RUN_CMD --platform=linux/amd64 --entrypoint=cat $ROOK_IMAGE $rook_template_dir/$rook_csv_template"
$IMAGE_RUN_CMD --platform=linux/amd64 --entrypoint=cat "$ROOK_IMAGE" $rook_template_dir/$rook_csv_template > $ROOK_CSV
echo "Listing rook crds using command: $IMAGE_RUN_CMD --platform=linux/amd64 --entrypoint=ls $ROOK_IMAGE -1 $rook_crds_dir/"
$IMAGE_RUN_CMD --platform=linux/amd64 --entrypoint=ls "$ROOK_IMAGE" -1 $rook_crds_dir/ > "$crd_list"
# shellcheck disable=SC2013
for i in $(cat "$crd_list"); do
# shellcheck disable=SC2059
crd_file=$(printf ${rook_crds_dir}/"$i" | tr -d '[:space:]')
echo "Dumping rook crd $crd_file using command: $IMAGE_RUN_CMD --platform=linux/amd64 --entrypoint=cat $ROOK_IMAGE $crd_file"
($IMAGE_RUN_CMD --platform=linux/amd64 --entrypoint=cat "$ROOK_IMAGE" "$crd_file") > $rook_crds_outdir/"$(basename "$crd_file")"
done;
rm -f "$crd_list"
echo "Creating rook image to play with using command: $IMAGE_BUILD_CMD create --name=$tmp_container $ROOK_IMAGE"
$IMAGE_BUILD_CMD create --name="$tmp_container" "$ROOK_IMAGE"
echo "Dumping rook csv using command: $IMAGE_BUILD_CMD cp $tmp_container:$rook_template_dir/$rook_csv_template $ROOK_CSV"
$IMAGE_BUILD_CMD cp "$tmp_container":$rook_template_dir/$rook_csv_template $ROOK_CSV
echo "Dumping rook crds using command: $IMAGE_BUILD_CMD cp $tmp_container:$rook_crds_dir $rook_crds_outdir"
$IMAGE_BUILD_CMD cp "$tmp_container":$rook_crds_dir $rook_crds_outdir
echo "Cleaning up rook container with command: $IMAGE_BUILD_CMD rm $tmp_container"
$IMAGE_BUILD_CMD rm "$tmp_container"
}

# ==== DUMP OCS YAMLS ====
Expand Down
Loading