diff --git a/build/generate_bundle.sh b/build/generate_bundle.sh index 3145eba13..81ec44cff 100755 --- a/build/generate_bundle.sh +++ b/build/generate_bundle.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -e -REL=$(dirname "$0") + +REL=$( $(dirname "$0") +REL=$( readlink -f $(dirname "$0")) # shellcheck source=build/metadata.sh . "${REL}/metadata.sh" @@ -22,9 +23,11 @@ generate_dockerfile() { generate_bundle() { REPLACE_REGEX="s#<>#${CREATED_DATE}#g;s#<>#${OPERATOR_IMAGE}#g;s#<>#${OPERATOR_TAG}#g;s#<>#${RELATED_IMAGE_PROMETHEUS_WEBHOOK_SNMP}#g;s#<>#${RELATED_IMAGE_PROMETHEUS_WEBHOOK_SNMP_TAG}#g;s#<>#${RELATED_IMAGE_OAUTH_PROXY}#g;s#<>#${RELATED_IMAGE_OAUTH_PROXY_TAG}#g;s#<>#${OPERATOR_BUNDLE_VERSION}#g;s#1.99.0#${OPERATOR_BUNDLE_VERSION}#g;s#<>#${OPERATOR_DOCUMENTATION_URL}#g;s#<>#${BUNDLE_OLM_SKIP_RANGE_LOWER_BOUND}#g" - pushd "${REL}/../" > /dev/null 2>&1 - ${OPERATOR_SDK} generate bundle --channels ${BUNDLE_CHANNELS} --default-channel ${BUNDLE_DEFAULT_CHANNEL} --manifests --metadata --version "${OPERATOR_BUNDLE_VERSION}" --output-dir "${WORKING_DIR}" > /dev/null 2>&1 - popd > /dev/null 2>&1 + echo ${OPERATOR_SDK} + ${OPERATOR_SDK} --version + pushd "${REL}/../" | tee -a /dev/null 2>&1 + ${OPERATOR_SDK} generate bundle --channels ${BUNDLE_CHANNELS} --default-channel ${BUNDLE_DEFAULT_CHANNEL} --manifests --metadata --version "${OPERATOR_BUNDLE_VERSION}" --output-dir "${WORKING_DIR}" | tee -a /dev/null 2>&1 + popd | tee -a /dev/null 2>&1 sed -i -E "${REPLACE_REGEX}" "${WORKING_DIR}/manifests/${OPERATOR_NAME}.clusterserviceversion.yaml" } @@ -35,7 +38,7 @@ copy_extra_metadata() { # purposes) does, and newer versions of opm (as used in both downstream and # upstream index image builds) also understands these files. Just copy them # into the bundle directory during building. - pushd "${REL}/../" > /dev/null 2>&1 + pushd "${REL}/../" | tee -a /dev/null 2>&1 cp -r ./deploy/olm-catalog/service-telemetry-operator/tests/ "${WORKING_DIR}" cp ./deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml "${WORKING_DIR}/metadata/" }