Skip to content

[WIP][DNM] Save and apply release image signatures #1019

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.

Sign up for GitHub

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

Closed
stbenjam wants to merge 1 commit into from
Closed

[WIP][DNM] Save and apply release image signatures #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions 04_setup_ironic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,14 @@ if [ ! -z "${MIRROR_IMAGES}" ]; then
_tmpfiles="$_tmpfiles $EXTRACT_DIR"
MIRROR_LOG_FILE=/tmp/tmp_image_mirror-${OPENSHIFT_RELEASE_TAG}.log

mkdir -p "$OCP_DIR/release-image-signature"

oc adm release mirror \
--insecure=true \
-a ${COMBINED_AUTH_FILE} \
--from ${OPENSHIFT_RELEASE_IMAGE} \
--to-release-image ${LOCAL_REGISTRY_DNS_NAME}:${LOCAL_REGISTRY_PORT}/localimages/local-release-image:${OPENSHIFT_RELEASE_TAG} \
--release-image-signature-to-dir "$OCP_DIR/release-image-signature" \
--to ${LOCAL_REGISTRY_DNS_NAME}:${LOCAL_REGISTRY_PORT}/localimages/local-release-image 2>&1 | tee ${MIRROR_LOG_FILE}
echo "export MIRRORED_RELEASE_IMAGE=$OPENSHIFT_RELEASE_IMAGE" > /tmp/mirrored_release_image

Expand Down
10 changes: 8 additions & 2 deletions utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,16 @@ function create_cluster() {
mkdir -p ${assets_dir}/openshift
cp -rf assets/generated/*.yaml ${assets_dir}/openshift

# Ensure release image signature config map is applied to cluster
if [ -d "$OCP_DIR/release-image-signature" ]; then
cp "$OCP_DIR/release-image-signature/*.yaml" "${assets_dir}/openshift" || true
fi

if [ ! -z "${IGNITION_EXTRA:-}" ]; then
$OPENSHIFT_INSTALLER --dir "${assets_dir}" --log-level=debug create ignition-configs
if ! jq . ${IGNITION_EXTRA}; then
echo "Error ${IGNITION_EXTRA} not valid json"
exit 1
exit 1
fi
mv ${assets_dir}/master.ign ${assets_dir}/master.ign.orig
jq -s '.[0] * .[1]' ${IGNITION_EXTRA} ${assets_dir}/master.ign.orig | tee ${assets_dir}/master.ign
Expand Down Expand Up @@ -357,6 +362,7 @@ EOF

_tmpfiles=
function removetmp(){
[ -n "$_tmpfiles" ] && rm -rf $_tmpfiles || true
true
# [ -n "$_tmpfiles" ] && rm -rf $_tmpfiles || true
}
trap removetmp EXIT