From fb1e863116453cc79dfdc68c8791f8757f9aaff3 Mon Sep 17 00:00:00 2001 From: Roberto Alfieri Date: Mon, 2 Oct 2023 15:37:50 +0200 Subject: [PATCH] Handle `openstack-ansibleee-operator` repo in `pin-bundle-images.sh script` Signed-off-by: Roberto Alfieri --- hack/pin-bundle-images.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/pin-bundle-images.sh b/hack/pin-bundle-images.sh index b440b98e8..9c848f29b 100755 --- a/hack/pin-bundle-images.sh +++ b/hack/pin-bundle-images.sh @@ -34,7 +34,7 @@ for MOD_PATH in $(go list -mod=readonly -m -json all | jq -r '. | select(.Path | CURL_REGISTRY="quay.io" REPO_CURL_URL="https://${CURL_REGISTRY}/api/v1/repository/openstack-k8s-operators" REPO_URL="${CURL_REGISTRY}/openstack-k8s-operators" - if [[ "$GITHUB_USER" != "openstack-k8s-operators" || "$BASE" == "$IMAGEBASE" ]]; then + if [[ "$GITHUB_USER" != "openstack-k8s-operators" || "$BASE" == *"$IMAGEBASE"* ]]; then if [[ "$IMAGENAMESPACE" != "openstack-k8s-operators" || "${IMAGEREGISTRY}" != "quay.io" ]]; then REPO_URL="${IMAGEREGISTRY}/${IMAGENAMESPACE}" CURL_REGISTRY="${IMAGEREGISTRY}" @@ -51,7 +51,7 @@ for MOD_PATH in $(go list -mod=readonly -m -json all | jq -r '. | select(.Path | fi fi - if [[ ${LOCAL_REGISTRY} -eq 1 && ( "$GITHUB_USER" != "openstack-k8s-operators" || "$BASE" == "$IMAGEBASE" ) ]]; then + if [[ ${LOCAL_REGISTRY} -eq 1 && ( "$GITHUB_USER" != "openstack-k8s-operators" || "$BASE" == *"$IMAGEBASE"* ) ]]; then SHA=$(curl -s ${REPO_CURL_URL}/$BASE-operator-bundle/tags/list | jq -r .tags[] | sort -u | grep $REF) elif [[ "${CURL_REGISTRY}" != "quay.io" ]]; then # quay.rdoproject.io doesn't support filter_tag_name, so increase limit to 100