Imporve the creation of index-image (kubevirt#2745)

1. fix bug that when creating index image for the first time for a version, the script fails. 2. build the index image from scratch, instead of building it from an existing index image, using opm. 3. simplify the script. 4. upgrade opm to v1.35.0 Signed-off-by: Nahshon Unna-Tsameret <[email protected]>
enp0s3 · Jan 21, 2024 · 700888b · 700888b
1 parent 9800040
commit 700888b
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 72 deletions.
diff --git a/.github/workflows/build-push-images.yaml b/.github/workflows/build-push-images.yaml
@@ -20,7 +20,7 @@ jobs:
       QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
       QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
       REGISTRY_NAMESPACE: kubevirt
-      OPM_VERSION: v1.26.2
+      OPM_VERSION: v1.35.0
     steps:
       - name: Checkout the latest code
         uses: actions/checkout@v4
@@ -41,7 +41,6 @@ jobs:
         run: |
           echo "IMAGE_TAG=${CSV_VERSION}-unstable" >> $GITHUB_ENV
           echo "UNSTABLE=UNSTABLE" >> $GITHUB_ENV
-          echo "FBCUNSTABLE=FBCUNSTABLE" >> $GITHUB_ENV
 
       - name: Build Applications Images
         env:
@@ -75,4 +74,3 @@ jobs:
         run: |
           export OPM=$(pwd)/linux-amd64-opm
           ./hack/build-index-image.sh ${{ env.IMAGE_TAG }} ${{ env.UNSTABLE }}
-          ./hack/build-index-image.sh ${{ env.IMAGE_TAG }} ${{ env.FBCUNSTABLE }}
diff --git a/.github/workflows/publish-community-operators.yaml b/.github/workflows/publish-community-operators.yaml
@@ -13,7 +13,7 @@ jobs:
       QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
       QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
       REGISTRY_NAMESPACE: kubevirt
-      OPM_VERSION: v1.26.2
+      OPM_VERSION: v1.35.0
     steps:
       - name: resolve the correct branch of the tag
         run: |
@@ -112,6 +112,8 @@ jobs:
           sed -i -E "s|(ARG INITIAL_VERSION=).*|\1${CSV_VERSION}|g;s|(ARG INITIAL_VERSION_SED=).*|\1\"${VERSION_4_SED}\"|g" deploy/index-image/Dockerfile.bundle.ci-index-image-upgrade
           sed -i -E "s|(ARG VERSION=).*|\1${CSV_VERSION}|g" deploy/olm-catalog/bundle.Dockerfile
           sed -i -E "s|(ARG INITIAL_VERSION=).*|\1${CSV_VERSION}|g;s|(ARG INITIAL_VERSION_SED=).*|\1\"${VERSION_4_SED}\"|g" deploy/olm-catalog/Dockerfile.bundle.ci-index-image-upgrade
+          sed -i -E "s|(quay.io/kubevirt/hyperconverged-cluster-bundle:).*|\1${CSV_VERSION}|g" deploy/olm-catalog/community-kubevirt-hyperconverged/index-template-release.yaml
+          echo "    - Image: quay.io/kubevirt/hyperconverged-cluster-bundle:${CSV_VERSION}" >> deploy/olm-catalog/community-kubevirt-hyperconverged/index-template-unstable.yaml
           git add ./deploy/
 
       - uses: peter-evans/create-pull-request@v3

diff --git a/deploy/olm-catalog/community-kubevirt-hyperconverged/icon.svg.b64 b/deploy/olm-catalog/community-kubevirt-hyperconverged/icon.svg.b64
@@ -0,0 +1 @@
+PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA3MDQgNzA3Ij4KICAgIDxkZWZzLz4KICAgIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPHBhdGggZD0iTTg4LjMzIDE0MC44OWwuMzgtLjQtLjM4LjR6TTc0LjE4IDE2Ny43MmMuOTYtMy4zIDIuODctNi41OCA1Ljc0LTkuODctMi44NyAzLjMtNC43OCA2LjU4LTUuNzQgOS44N3pNMjI3LjUyIDY5MC43MWMtMi45NCAwLTYuNjIgMC05LjU2LS45OSAzLjY3IDAgNi42Mi45OSA5LjU2Ljk5eiIvPgogICAgICAgIDxwYXRoIGZpbGw9IiMwMEFBQjIiIGZpbGwtcnVsZT0ibm9uemVybyIKICAgICAgICAgICAgICBkPSJNNjA2Ljg0IDEzNi45NEwzNzEuMjkgMjAuNTRsLTIuMy0xLjE4YTE4LjUgMTguNSAwIDAwLTQuOTYtMS41OGMtMS41My0uNC0zLjA2LS43OS00LjYtLjc5LTIuMjktLjM5LTQuOTYtLjM5LTcuMjYtLjM5LTQuOTcgMC05LjU2IDAtMTQuNTMuNzktMS41My40LTMuMDYuNC00Ljk3Ljc5TDk3LjEyIDEzNS4zNmEzNC45MSAzNC45MSAwIDAwLTguMDMgNS4xM2wtLjM4LjQgMTIxLjk4IDI1My4zLTkxLjc3LTE5My4zM0gyNzMuOGw2MS45NCAxMTcuOTctMjEuNDEgNDEuMDQtLjc3LjQtNjIuNy0xMTkuOTVIMTgyLjRsMTA3LjgzIDIzNS45NSAxNS4zLTMwYzQuOTYtOS40NiAxNi40NC0xMy40IDI2LTguMjhhMjAuMzMgMjAuMzMgMCAwMTguMDIgMjYuODNsLTI3LjkgNTQuMDYtMjEuNDIgNDEuMDMgNjIuNyAxMjkuODFMNDEyLjIyIDU2OWMtNi4xMiA4LjY4LTE4LjM2IDEwLjY1LTI2Ljc3IDQuMzQtNy42NS01LjUzLTkuOTQtMTYuMTgtNS43NC0yNC40N2wxMy43Ny0yOC40YzUuMzUtOS40NyAxNi44My0xMi42MyAyNi03LjEgOC4wMyA0LjczIDExLjQ3IDE0Ljk5IDguNDEgMjQuMDZsMjcuOTItNTYuODFjLTYuMTIgOC42OC0xOC4zNiAxMC42NS0yNi43NyAzLjk0YTE5LjkzIDE5LjkzIDAgMDEtNS43My0yNC40NmwyNy41My01Ni40MmM0LjU5LTkuODcgMTYuMDYtMTMuODEgMjUuNjItOC42OGExOS42NSAxOS42NSAwIDAxOC40MSAyNi40M2wtNi44OCAxMy44MSAzNS4xOC03MS44MWMtNi4xMiA5LjA4LTE3Ljk4IDExLjQ0LTI2LjM5IDUuMTNhMTkuNzggMTkuNzggMCAwMS02LjUtMjQuODZsMjcuMTUtNTYuNDJjNC41OS05Ljg2IDE2LjA2LTEzLjgxIDI1LjYyLTguNjggOS41NiA0LjczIDEzLjM4IDE2LjU3IDguNDEgMjYuNDRsLTE1LjMgMzEuOTUgNDMuNi04OC43N2MtNS4zNiA5LjQ3LTE2LjgzIDEzLjAyLTI2IDcuNWEyMC4wMyAyMC4wMyAwIDAxLTkuMTgtMTMuMDNoLTIyLjk0Yy0xMC43MSAwLTE5LjEyLTguNjgtMTkuMTItMTkuNzIgMC0xMS4wNSA4LjQxLTE5LjczIDE5LjEyLTE5LjczaDc5LjkxbC0xOS4xMiAzOS4wNiA0Ny4wNC05NS44OGE0MC44MiA0MC44MiAwIDAwLTQuNi0zLjk0IDQxLjg1IDQxLjg1IDAgMDAtOC4wMi01LjUzek00MDUuNyAzNDQuMWwtMjguNjggNTUuNjNjLTQuOTcgOS40Ny0xNi40NCAxMy40Mi0yNiA4LjI5LTkuNTYtNS4xMy0xMy0xNi45Ny04LjAzLTI2LjgzbDI4LjY3LTU1LjY0YzQuOTgtOS40NyAxNi40NS0xMy40MSAyNi04LjI4IDkuNTcgNS4xMyAxMyAxNy4zNiA4LjA0IDI2Ljgzem01OC44OC0xMTUuMjJsLTI4LjY4IDU2LjAzYy00Ljk3IDkuNDctMTYuNDQgMTMuNDItMjYgOC4yOWEyMC4zMyAyMC4zMyAwIDAxLTguMDMtMjYuODNsMzMuNjUtNjYuMjloMTIuMjRjMy4wNiAwIDYuMTIuOCA4LjggMi4zN2ExOS42MiAxOS42MiAwIDAxOC4wMiAyNi40M3oiLz4KICAgICAgICA8cGF0aCBmaWxsPSIjRkZGIiBmaWxsLXJ1bGU9Im5vbnplcm8iCiAgICAgICAgICAgICAgZD0iTTg5LjEgMTQwLjVhOTEuMDUgOTEuMDUgMCAwMTguMDItNS4xNEwzMzIuNjcgMTguMThjMS41My0uNCAzLjA2LS44IDQuNTktLjggNC45Ny0uNzggOS45NC0uNzggMTQuOTEtLjc4IDIuMyAwIDQuOTcgMCA3LjI3LjQgMS41My4zOSAzLjQ0LjM5IDQuOTcuNzggMS41My40IDMuNDQuOCA0Ljk3IDEuNThsMi4zIDEuMTkgMjM1LjU0IDExNi40YTQxLjg1IDQxLjg1IDAgMDE4LjAzIDUuNTIgNDAuODIgNDAuODIgMCAwMTQuNTkgMy45NGw3LjI3LTE0LjZjLTMuODMtMy4xNS04LjAzLTYuMzEtMTIuNjItOC42OGgtLjc3TDM3OC4xOCA2LjM0YTU0LjMgNTQuMyAwIDAwLTI2LTUuNTJjLTcuNjUtLjQtMTUuMy40LTIyLjk1IDEuOTdsLTEuNTMuNC0xLjUzLjc4TDkwLjYyIDEyMS4xNmE2Ni45OSA2Ni45OSAwIDAwLTguNzkgNS41Mmw2Ljg4IDE0LjIuMzgtLjM5ek03MDUuNSA0MjUuMzdsLS4zOS0xLjU4LTU4Ljg5LTI2MC40MXYtMS4xOWMtMy40NC0xMS40NC0xMC4zMi0yMi4xLTE5LjUtMjkuNTlsLTcuMjYgMTQuNmM0LjIgNC4zNCA4LjAzIDkuNDcgMTAuMzIgMTVhMjIuNzQgMjIuNzQgMCAwMTEuNTMgNC43M2w1OC41IDI2MC40MWE5MiA5MiAwIDAxLjM5IDEwLjI2YzAgMy4xNS0uNzcgNS45Mi0xLjE1IDkuMDcgMCAuOC0uMzggMS41OC0uMzggMi4zN2E1Ni4yMyA1Ni4yMyAwIDAxLTcuNjUgMTYuOTdsLTcwLjM2IDg5Ljk2LTkyLjUzIDExNy45N2MtNi4xMiA4LjY4LTE1LjY4IDE0LjItMjYgMTUuNzgtMy4wNi40LTYuNS44LTkuNTYuOEgzNTIuOTRsNTguODggMTUuNzhoNzAuNzVjMjAuMjYgMCAzNy4wOS04LjI5IDQ3LjgtMjIuODlsMTYyLjg5LTIwNy45My4zOC0uNC4zOC0uNGM5LjU2LTE0LjYgMTMuNzctMzEuOTUgMTEuNDctNDkuMzF6TTIyMi45MyA2OTAuMTJjLTEuNTMgMC0zLjQ0LS40LTQuOTctLjQtMi4zLS40LTQuMi0uNzktNi41LTEuNTdsLTMuNDQtMS4xOWMtMi4zLS43OS00LjYtMS45Ny02LjUtMi43NmE2MC4wMSA2MC4wMSAwIDAxLTkuMTgtNS45MmMtMS45MS0xLjU4LTMuODMtMy4xNi01LjM2LTQuNzNsLTU0LjMtNjkuNDUtMTA4LjItMTM4Ljg4YTUzLjQyIDUzLjQyIDAgMDEtOC44LTIzLjI4Yy0uMzgtMS41OC0uMzgtMy4xNi0uMzgtNC43NCAwLTMuNTUgMC02LjcuNzYtMTAuMjVsNTguMTItMjYyYTI1LjY0IDI1LjY0IDAgMDEyLjMtNy4xYzIuNjctNi43IDYuODgtMTIuMjMgMTIuMjMtMTYuOTZsLTYuODgtMTQuMmE1Ny41MyA1Ny41MyAwIDAwLTIyLjU2IDM0LjcxbC01OC4xMiAyNjJ2Ljc5Yy0zLjA2IDE3Ljc1IDEuMTQgMzUuNSAxMS4wOSA1MC4xbC4zOC40LjM4LjRMMTc1LjUxIDY4My40bC4zOS43OS43Ni40YTY5LjgyIDY5LjgyIDAgMDA0NS41IDIxLjNoMTMwLjc4di0xNS43OEgyMjIuOTN6Ii8+CiAgICAgICAgPHBhdGggZmlsbD0iI0ZGRiIgZmlsbC1ydWxlPSJub256ZXJvIiBkPSJNMzUyLjk0IDY5MC4xMnYxNS43OGg1OC44OHoiLz4KICAgICAgICA8cGF0aCBmaWxsPSIjMDA3OTdGIiBmaWxsLXJ1bGU9Im5vbnplcm8iCiAgICAgICAgICAgICAgZD0iTTI4OS44NSA1NjEuMWwtNzkuMTYtMTY2LjVMODguMzMgMTQwLjg4YTQxLjY4IDQxLjY4IDAgMDAtMTIuMjQgMTYuOTZsLTIuMjkgNy4xLTU3Ljc0IDI2MmMtLjc2IDMuNTUtLjc2IDYuNy0uNzYgMTAuMjUgMCAxLjU4IDAgMy4xNi4zOCA1LjEzYTU3LjQzIDU3LjQzIDAgMDA4LjggMjMuMjhMMTMzLjA2IDYwNC41bDU0LjMgNjguNjVjMS41MyAxLjU4IDMuNDQgMy4xNiA1LjM1IDQuNzRhMzcuMDggMzcuMDggMCAwMDkuMTggNS45MmMyLjMgMS4xOCA0LjIgMS45NyA2LjUgMi43NmwzLjQ0IDEuMThjMS45MS43OSA0LjIgMS4xOCA2LjUgMS41OCAxLjUzLjQgMy40NC40IDQuOTcuNGgxMzAuMDFMMjkwLjk5IDU1OS45bC0xLjE0IDEuMTl6Ii8+CiAgICAgICAgPHBhdGggZD0iTTE1LjMgNDM3LjJjMC0zLjU1IDAtNi43IDEuOS0xMC4yNSIvPgogICAgICAgIDxwYXRoIGZpbGw9IiMwMDc5N0YiIGZpbGwtcnVsZT0ibm9uemVybyIKICAgICAgICAgICAgICBkPSJNMTk2LjkzIDY4My40MWMtMy40Mi0zLjI5LTYuODMtNi41OC05LjU2LTkuODYgMi43MyAzLjI4IDYuMTQgNi41NyA5LjU2IDkuODZ6Ii8+CiAgICAgICAgPHBhdGggZD0iTTIwMi4yOCA2ODcuNzVhNjguNyA2OC43IDAgMDEtOS41Ni05Ljg2TTE4Ny4zNyA2NzMuMTVsLTU0LjMtNjkuMDVNMjE3IDY4OS45MmwtOC42LTIuOTYiLz4KICAgICAgICA8cGF0aCBmaWxsPSIjMDA3OTdGIiBmaWxsLXJ1bGU9Im5vbnplcm8iCiAgICAgICAgICAgICAgZD0iTTIxMS40NiA2OTEuMWMtMy4zOC0xLjk3LTYuNzUtNC45My05LjU2LTYuOSAyLjggMS45NyA2LjE4IDQuOTMgOS41NiA2Ljl6Ii8+CiAgICAgICAgPHBhdGggZmlsbD0iIzNBQ0NDNSIgZmlsbC1ydWxlPSJub256ZXJvIgogICAgICAgICAgICAgIGQ9Ik01NzAuMTMgMjQ3LjQybC00My42IDg4Ljc4LTExLjg0IDI0LjQ2YTguNjggOC42OCAwIDAxLTEuMTUgMS45N2wtMzUuMTggNzEuNDItMjAuNjUgNDIuNjFjLS4zOC43OS0xLjE1IDEuOTctMS41MyAyLjc2bC0yNy45MSA1Ny4yMWMwIC40IDAgLjQtLjM5LjhsLTEzLjc2IDI4LjRjLS4zOC43OS0xLjE1IDEuOTctMS41MyAyLjc2bC01OS4yNyAxMjAuNzRoMTI5LjYzYzMuMDYgMCA2LjUtLjQgOS41Ni0uNzlhMzkuOCAzOS44IDAgMDAyNi0xNS43OGw5Mi41NC0xMTcuOTggNzAuMzUtODkuOTZhNTIuMiA1Mi4yIDAgMDA3LjY1LTE2Ljk2Yy4zOC0uOC4zOC0xLjU4LjM4LTIuMzdhMzYuOSAzNi45IDAgMDAxLjE1LTkuMDhjMC0zLjU1IDAtNi43LS4zOC0xMC4yNWwtNTguNS0yNTkuNjNjLS4zOS0xLjU3LTEuMTUtMy4xNS0xLjU0LTQuNzMtMi4yOS01LjUyLTYuMTEtMTAuNjUtMTAuMzItMTVsLTQ3LjAzIDk1LjQ5LTIuNjggNS4xM3oiLz4KICAgICAgICA8cGF0aCBkPSJNNjkyLjMgNDM3LjJjMCAzLjQzLTEuOTEgNi40NC0yLjg3IDkuODdNNjkyLjY4IDQ0OC42NWMtMS45IDMuNDUtMy44MiA2LjktNi42OSA5Ljg2TTQ5Mi4xMiA2ODkuMzNhMzkuOCAzOS44IDAgMDAyNi0xNS43OGw5Mi41NC0xMTcuOThNNjkwLjU4IDQyNi45NWMuOTYgMy41NS45NiA2LjcuOTYgMTAuMjUiLz4KICAgICAgICA8cGF0aCBmaWxsPSIjRkZGIiBmaWxsLXJ1bGU9Im5vbnplcm8iCiAgICAgICAgICAgICAgZD0iTTM5Ny42OCAzMTcuMjZjLTkuMTgtNS4xMy0yMS4wMy0xLjU4LTI2IDguMjhMMzQzIDM4MS4xOGMtNC45NyA5LjQ3LTEuNTMgMjEuNyA4LjAzIDI2LjgzIDkuMTcgNS4xMyAyMS4wMyAxLjU3IDI2LTguMjlsMjguNjgtNTUuNjNjNC45Ny05LjQ3IDEuMTQtMjEuNy04LjAzLTI2Ljgzek00MTkuMDkgNTExLjM4YTE5LjAzIDE5LjAzIDAgMDAtMjUuNjIgOC42OGwtMTMuNzcgMjguNDFjLTQuNTggOS44Ni0uNzYgMjEuNyA4LjggMjYuNDQgOC40MSA0LjM0IDE4LjM1IDEuNTcgMjMuNy01LjkybDE1LjY4LTMxLjk2YzQuMjEtOS40Ny4zOS0yMC45MS04Ljc5LTI1LjY1ek00MjcuODggNTM3LjgyYzAtLjQgMC0uNC4zOS0uOEw0MTIuNTkgNTY5YTYuNDEgNi40MSAwIDAwMS41My0yLjc2bDEzLjc2LTI4LjQxeiIvPgogICAgICAgIDxwYXRoIGZpbGw9IiNGRkYiIGZpbGwtcnVsZT0ibm9uemVybyIKICAgICAgICAgICAgICBkPSJNMzExLjY0IDUxOS4yN2wyNy45MS01NC4wNWM0Ljk4LTkuNDcgMS41My0yMS43LTguMDMtMjYuODMtOS4xNy01LjEzLTIxLjAzLTEuNTgtMjYgOC4yOGwtMTUuMyAyOS45OUwxODIuNCAyNDAuMzJoNjguNDRsNjIuNzEgMTE5Ljk0Ljc3LS40IDIxLjAzLTQwLjYzLTYxLjk1LTExOC4zN0gxMTguNTRMMjEwLjMgMzk0LjJsNzkuOTIgMTY1LjcxIDIxLjQxLTQwLjY0eiIvPgogICAgICAgIDxwYXRoIGZpbGw9IiNGRkYiIGZpbGwtcnVsZT0ibm9uemVybyIKICAgICAgICAgICAgICBkPSJNMjkwLjIzIDU2MC4zMWwtNzkuNTQtMTY1LjcyIDc5LjE2IDE2Ni41MXpNNTkxLjU0IDIwMy4yM2gtNzkuOTFjLTEwLjcxIDAtMTkuMTIgOC42OC0xOS4xMiAxOS43MyAwIDExLjA0IDguNDEgMTkuNzIgMTkuMTIgMTkuNzJoMjIuOTRjMi4zIDEwLjY2IDEyLjYyIDE3LjM3IDIyLjk0IDE1YTE5LjUgMTkuNSAwIDAwMTIuNjItOS40N2wyLjY4LTUuNTMgMTguNzMtMzkuNDV6TTU3Ni44MiAyNDIuMjlsLTYuNjkgOS44Ni45Ni0uN3pNNTQxLjgzIDMwNC42M2M0Ljk4LTkuODYgMS4xNS0yMS43LTguNC0yNi40NC05LjU3LTQuNzMtMjEuMDQtMS4xOC0yNS42MyA4LjY5di4zOWwtMjcuMTUgNTYuNDJjLTQuNTkgOS44Ny0uNzYgMjEuNyA4LjggMjYuNDQgOC40MSA0LjM0IDE4LjczIDEuNTggMjQuMDktNi43MWwxMy0yNi44MyAxNS4zLTMxLjk2eiIvPgogICAgICAgIDxwYXRoIGZpbGw9IiNGRkYiIGZpbGwtcnVsZT0ibm9uemVybyIKICAgICAgICAgICAgICBkPSJNNTI2LjU0IDMzNi41OWwtMTMgMjYuODNjLjM4LS43OS43Ni0xLjU4IDEuMTUtMS45N2wxMS44NS0yNC44NnpNNDg0Ljg2IDQyMS4wM2M0LjU5LTkuODcuNzYtMjEuNy04LjQxLTI2LjQ0LTkuMTgtNC43My0yMS4wMy0uNzktMjUuNjIgOC42OGwtMjcuMTUgNTYuNDJjLTQuNTkgOS44Ny0uNzcgMjEuNyA4LjggMjYuNDQgOC40IDQuMzQgMTguMzUgMS41OCAyMy43LTUuOTJsMjIuMTgtNDUuMzcgNi41LTEzLjgxeiIvPgogICAgICAgIDxwYXRoIGZpbGw9IiNGRkYiIGZpbGwtcnVsZT0ibm9uemVybyIKICAgICAgICAgICAgICBkPSJNNDc4LjM2IDQzNC44NGwtMjIuMTggNDUuMzdjLjc3LS43OSAxLjE1LTEuOTcgMS41My0yLjc2bDIwLjY1LTQyLjYxek00NTYuNTYgMjAyLjQ0YTE3LjM0IDE3LjM0IDAgMDAtOC44LTIuMzdoLTExLjg1bC0zMy42NCA2Ni4yOWEyMC4xNSAyMC4xNSAwIDAwNC45NyAyNy42MmM4LjggNi4zMSAyMC42NCAzLjk0IDI2Ljc2LTUuMTMuNzctMS4xOSAxLjUzLTIuMzcgMS45MS0zLjk1bDI4LjY4LTU1LjYzYzQuOTctOS44NiAxLjUzLTIxLjctOC4wMy0yNi44My4zOSAwIDAgMCAwIDB6Ii8+CiAgICA8L2c+Cjwvc3ZnPg==
diff --git a/deploy/olm-catalog/community-kubevirt-hyperconverged/index-template-release.yaml b/deploy/olm-catalog/community-kubevirt-hyperconverged/index-template-release.yaml
@@ -0,0 +1,7 @@
+Schema: olm.semver
+GenerateMajorChannels: true
+GenerateMinorChannels: true
+DefaultChannelTypePreference: minor
+Stable:
+  Bundles:
+    - Image: quay.io/kubevirt/hyperconverged-cluster-bundle:1.11.0
diff --git a/deploy/olm-catalog/community-kubevirt-hyperconverged/index-template-unstable.yaml b/deploy/olm-catalog/community-kubevirt-hyperconverged/index-template-unstable.yaml
@@ -0,0 +1,12 @@
+Schema: olm.semver
+GenerateMajorChannels: true
+GenerateMinorChannels: true
+DefaultChannelTypePreference: minor
+Candidate:
+  Bundles:
+    - Image: quay.io/kubevirt/hyperconverged-cluster-bundle:1.6.0
+    - Image: quay.io/kubevirt/hyperconverged-cluster-bundle:1.7.0
+    - Image: quay.io/kubevirt/hyperconverged-cluster-bundle:1.8.0
+    - Image: quay.io/kubevirt/hyperconverged-cluster-bundle:1.9.0
+    - Image: quay.io/kubevirt/hyperconverged-cluster-bundle:1.10.1
+    - Image: quay.io/kubevirt/hyperconverged-cluster-bundle:1.11.0
diff --git a/hack/build-index-image.sh b/hack/build-index-image.sh
@@ -13,8 +13,9 @@ set -ex
 ##################################################################
 
 PROJECT_ROOT="$(readlink -e "$(dirname "${BASH_SOURCE[0]}")"/../)"
-DEPLOY_DIR="${PROJECT_ROOT}/deploy/olm-catalog"
+ORIG_DEPLOY_DIR="${PROJECT_ROOT}/deploy/olm-catalog"
 OUT_DIR="${PROJECT_ROOT}/_out"
+DEPLOY_DIR="${OUT_DIR}/deploy/olm-catalog"
 PACKAGE_NAME="community-kubevirt-hyperconverged"
 IMAGE_REGISTRY=${IMAGE_REGISTRY:-quay.io}
 REGISTRY_NAMESPACE=${REGISTRY_NAMESPACE:-kubevirt}
@@ -26,18 +27,13 @@ UNSTABLE=$2
 
 function create_index_image() {
   CURRENT_VERSION=$1
-  PREV_VERSION=$2
   INITIAL_VERSION=${CURRENT_VERSION}
-  if [[ "${UNSTABLE}" == "UNSTABLE" ]] || [[ "${UNSTABLE}" == "FBCUNSTABLE" ]]; then
+  if [[ "${UNSTABLE}" == "UNSTABLE" ]]; then
     mv ${PACKAGE_NAME}/${CURRENT_VERSION} ${PACKAGE_NAME}/${CURRENT_VERSION}-unstable
     CURRENT_VERSION=${CURRENT_VERSION}-unstable
-    PREV_VERSION=${PREV_VERSION}-unstable
   fi
   BUNDLE_IMAGE_NAME="${IMAGE_REGISTRY}/${REGISTRY_NAMESPACE}/${BUNDLE_REGISTRY_IMAGE_NAME}:${CURRENT_VERSION}"
   INDEX_IMAGE_NAME="${IMAGE_REGISTRY}/${REGISTRY_NAMESPACE}/${INDEX_REGISTRY_IMAGE_NAME}:${CURRENT_VERSION}"
-  if [[ "${UNSTABLE}" == "FBCUNSTABLE" ]]; then
-    INDEX_IMAGE_NAME="${IMAGE_REGISTRY}/${REGISTRY_NAMESPACE}/${INDEX_REGISTRY_IMAGE_NAME}:${INITIAL_VERSION}-fbc-unstable"
-  fi
 
   podman build -t "${BUNDLE_IMAGE_NAME}" -f bundle.Dockerfile --build-arg "VERSION=${CURRENT_VERSION}" .
   podman push "${BUNDLE_IMAGE_NAME}"
@@ -46,77 +42,48 @@ function create_index_image() {
   # unalignment between cached index image and fetched bundle image.
   BUNDLE_IMAGE_NAME=$("${PROJECT_ROOT}/tools/digester/digester" --image "${BUNDLE_IMAGE_NAME}")
 
-  if [[ "${UNSTABLE}" == "UNSTABLE" ]]; then
-    # Currently, ci-operator does not support index images with file-based catalogs.
-    # To maintain CI functionality, we'll keep using SQLite-based catalogs for the unstable tags
-    # until FBC handling will be implemented in openshift ci-operator.
-    # With FBCUNSTABLE the unstable index image will be built as FBC based and named
-    # -fbc-unstable to enable the transition to FBC only
-    # shellcheck disable=SC2086
-    ${OPM} index add --bundles "${BUNDLE_IMAGE_NAME}" ${INDEX_IMAGE_PARAM} --tag "${INDEX_IMAGE_NAME}" -u podman --mode semver
-  else
-    mkdir -p "${OUT_DIR}"
-    (cd "${OUT_DIR}" && create_file_based_catalog)
-  fi
+  create_file_based_catalog "${INITIAL_VERSION}" "${BUNDLE_IMAGE_NAME}" "${UNSTABLE}"
 
   podman push "${INDEX_IMAGE_NAME}"
-
-  if [[ "${CURRENT_VERSION}" != "${INITIAL_VERSION}" ]]; then
-    mv ${PACKAGE_NAME}/${CURRENT_VERSION} ${PACKAGE_NAME}/${INITIAL_VERSION}
-  fi
 }
 
 function create_file_based_catalog() {
+  INITIAL_VERSION=$1
+  BUNDLE_IMAGE_NAME=$2
+  UNSTABLE=$3
+
   # File-Based Catalog handling
-  rm -rf fbc-catalog*
-  ${OPM} migrate "${INDEX_IMAGE_NAME}" fbc-catalog || true
-  if [ ! -d fbc-catalog ]
-  then
-    # The index image is already in file-based format. Extracting its catalog file
-    # TODO: we should handle the case where we are releasing X.Y.0 and
-    # quay.io/kubevirt/hyperconverged-cluster-index:X.Y.0 never got pushed!
-    oc image extract "${INDEX_IMAGE_NAME}" --file /configs/catalog.json
-  else
-    # The migration took place
-    mv fbc-catalog/community-kubevirt-hyperconverged/catalog.json catalog.json
+  cd "${OUT_DIR}"
+  template_file=index-template-release.yaml
+  if [[ "${UNSTABLE}" == "UNSTABLE" ]]; then
+    template_file=index-template-unstable.yaml
   fi
 
-  ${OPM} render "${BUNDLE_IMAGE_NAME}" > bundle.json
-  CSV_NAME=$(jq -r .name bundle.json)
-  VERSION=${CSV_NAME##*.v}
-  SKIPRANGE="<"${VERSION}
-  CHANNEL=${CURRENT_VERSION%-*}
-
-  # Remove the existing channel schema from the catalog
-  jq --arg CHANNEL "$CHANNEL" 'del(. | select(.schema=="olm.channel" and .name==$CHANNEL))' \
-   catalog.json > updated_fbc.json
-
-  # Insert the new channel schema for the new bundle instead of the one we removed previously
-  jq --arg CSV_NAME "$CSV_NAME" --arg SKIPRANGE "$SKIPRANGE" --arg CHANNEL "$CHANNEL" '. |
-    select(.schema=="olm.channel" and .name==$CHANNEL) |
-    .entries[0].name=$CSV_NAME |
-    .entries[0].skipRange=$SKIPRANGE' \
-      catalog.json >> updated_fbc.json
-
-  mv updated_fbc.json updated_fbc.json.tmp
-  # Remove the existing bundle schema from the catalog
-  jq --arg CHANNEL "$CHANNEL" 'del(. |
-    select(.schema=="olm.bundle" and (.name | contains($CHANNEL))))' \
-    updated_fbc.json.tmp > updated_fbc.json
-
-  mkdir -p fbc-catalog
-  cat bundle.json >> updated_fbc.json
-  sed -i '/null/d' updated_fbc.json
-  mv updated_fbc.json fbc-catalog/catalog.json
+  cp "deploy/olm-catalog/community-kubevirt-hyperconverged/${template_file}" ./index-template.yaml
+
+  if [[ "quay.io/kubevirt/hyperconverged-cluster-bundle:${INITIAL_VERSION}" != "${BUNDLE_IMAGE_NAME}" ]]; then
+    sed -i -E "s|quay.io/kubevirt/hyperconverged-cluster-bundle:${INITIAL_VERSION}|${BUNDLE_IMAGE_NAME}|g" index-template.yaml
+  fi
+
+  while IFS= read -r line; do
+    image=$(echo "${line}" | sed -E 's|.*(quay.io/kubevirt/hyperconverged-cluster-bundle:.*)|\1|g')
+    digest=$("${PROJECT_ROOT}/tools/digester/digester" --image "${image}")
+    sed -i "s|${image}|${digest}|g" index-template.yaml
+  done < <(grep 'quay.io/kubevirt/hyperconverged-cluster-bundle:' index-template.yaml)
+
+  rm -rf fbc-catalog
+  mkdir fbc-catalog
+  ${OPM} alpha render-template semver index-template.yaml > fbc-catalog/catalog.json
   ${OPM} validate fbc-catalog
+  rm -f fbc-catalog.Dockerfile
   ${OPM} generate dockerfile fbc-catalog
   podman build -t "${INDEX_IMAGE_NAME}" -f fbc-catalog.Dockerfile
 }
 
 function create_all_versions() {
   PREV_VERSION=
   for version in $(ls -d ${PACKAGE_NAME}/*/ | sort -V | cut -d '/' -f 2); do
-    create_index_image "${version}" "${PREV_VERSION}"
+    create_index_image "${version}"
     PREV_VERSION=${version}
   done
 }
@@ -128,20 +95,22 @@ function create_latest_version() {
     PREV_VERSION=${CURRENT_VERSION}
     CURRENT_VERSION=${version}
   done
-  create_index_image "${CURRENT_VERSION}" "${PREV_VERSION}"
+  create_index_image "${CURRENT_VERSION}"
 }
 
 function build_specific_version() {
   CURRENT_VERSION=
-  PREV_VERSION=
   for version in $(ls -d ${PACKAGE_NAME}/*/ | sort -V | cut -d '/' -f 2); do
-    PREV_VERSION=${CURRENT_VERSION}
-    CURRENT_VERSION=${version}
-    if [[ "$1" == "${CURRENT_VERSION}" ]]; then
+    if [[ "$1" == "${version}" ]]; then
+      CURRENT_VERSION="${version}"
       break
     fi
   done
-  create_index_image "${CURRENT_VERSION}" "${PREV_VERSION}"
+  if [[ -z ${CURRENT_VERSION} ]]; then
+    echo "can't find version $1"
+    exit 1
+  fi
+  create_index_image "${CURRENT_VERSION}"
 }
 
 function help() {
@@ -153,6 +122,9 @@ if [[ $# -gt 2 ]] || [[ $# -lt 1 ]]; then
   exit 1
 fi
 
+rm -rf "${DEPLOY_DIR}"
+mkdir -p "${DEPLOY_DIR}"
+cp -r ${ORIG_DEPLOY_DIR}/* "${DEPLOY_DIR}/"
 cd "${DEPLOY_DIR}"
 
 case "$1" in
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 704 707">
    <defs/>
    <g fill="none" fill-rule="evenodd">
        <path d="M88.33 140.89l.38-.4-.38.4zM74.18 167.72c.96-3.3 2.87-6.58 5.74-9.87-2.87 3.3-4.78 6.58-5.74 9.87zM227.52 690.71c-2.94 0-6.62 0-9.56-.99 3.67 0 6.62.99 9.56.99z"/>
        <path fill="#00AAB2" fill-rule="nonzero"
              d="M606.84 136.94L371.29 20.54l-2.3-1.18a18.5 18.5 0 00-4.96-1.58c-1.53-.4-3.06-.79-4.6-.79-2.29-.39-4.96-.39-7.26-.39-4.97 0-9.56 0-14.53.79-1.53.4-3.06.4-4.97.79L97.12 135.36a34.91 34.91 0 00-8.03 5.13l-.38.4 121.98 253.3-91.77-193.33H273.8l61.94 117.97-21.41 41.04-.77.4-62.7-119.95H182.4l107.83 235.95 15.3-30c4.96-9.46 16.44-13.4 26-8.28a20.33 20.33 0 018.02 26.83l-27.9 54.06-21.42 41.03 62.7 129.81L412.22 569c-6.12 8.68-18.36 10.65-26.77 4.34-7.65-5.53-9.94-16.18-5.74-24.47l13.77-28.4c5.35-9.47 16.83-12.63 26-7.1 8.03 4.73 11.47 14.99 8.41 24.06l27.92-56.81c-6.12 8.68-18.36 10.65-26.77 3.94a19.93 19.93 0 01-5.73-24.46l27.53-56.42c4.59-9.87 16.06-13.81 25.62-8.68a19.65 19.65 0 018.41 26.43l-6.88 13.81 35.18-71.81c-6.12 9.08-17.98 11.44-26.39 5.13a19.78 19.78 0 01-6.5-24.86l27.15-56.42c4.59-9.86 16.06-13.81 25.62-8.68 9.56 4.73 13.38 16.57 8.41 26.44l-15.3 31.95 43.6-88.77c-5.36 9.47-16.83 13.02-26 7.5a20.03 20.03 0 01-9.18-13.03h-22.94c-10.71 0-19.12-8.68-19.12-19.72 0-11.05 8.41-19.73 19.12-19.73h79.91l-19.12 39.06 47.04-95.88a40.82 40.82 0 00-4.6-3.94 41.85 41.85 0 00-8.02-5.53zM405.7 344.1l-28.68 55.63c-4.97 9.47-16.44 13.42-26 8.29-9.56-5.13-13-16.97-8.03-26.83l28.67-55.64c4.98-9.47 16.45-13.41 26-8.28 9.57 5.13 13 17.36 8.04 26.83zm58.88-115.22l-28.68 56.03c-4.97 9.47-16.44 13.42-26 8.29a20.33 20.33 0 01-8.03-26.83l33.65-66.29h12.24c3.06 0 6.12.8 8.8 2.37a19.62 19.62 0 018.02 26.43z"/>
        <path fill="#FFF" fill-rule="nonzero"
              d="M89.1 140.5a91.05 91.05 0 018.02-5.14L332.67 18.18c1.53-.4 3.06-.8 4.59-.8 4.97-.78 9.94-.78 14.91-.78 2.3 0 4.97 0 7.27.4 1.53.39 3.44.39 4.97.78 1.53.4 3.44.8 4.97 1.58l2.3 1.19 235.54 116.4a41.85 41.85 0 018.03 5.52 40.82 40.82 0 014.59 3.94l7.27-14.6c-3.83-3.15-8.03-6.31-12.62-8.68h-.77L378.18 6.34a54.3 54.3 0 00-26-5.52c-7.65-.4-15.3.4-22.95 1.97l-1.53.4-1.53.78L90.62 121.16a66.99 66.99 0 00-8.79 5.52l6.88 14.2.38-.39zM705.5 425.37l-.39-1.58-58.89-260.41v-1.19c-3.44-11.44-10.32-22.1-19.5-29.59l-7.26 14.6c4.2 4.34 8.03 9.47 10.32 15a22.74 22.74 0 011.53 4.73l58.5 260.41a92 92 0 01.39 10.26c0 3.15-.77 5.92-1.15 9.07 0 .8-.38 1.58-.38 2.37a56.23 56.23 0 01-7.65 16.97l-70.36 89.96-92.53 117.97c-6.12 8.68-15.68 14.2-26 15.78-3.06.4-6.5.8-9.56.8H352.94l58.88 15.78h70.75c20.26 0 37.09-8.29 47.8-22.89l162.89-207.93.38-.4.38-.4c9.56-14.6 13.77-31.95 11.47-49.31zM222.93 690.12c-1.53 0-3.44-.4-4.97-.4-2.3-.4-4.2-.79-6.5-1.57l-3.44-1.19c-2.3-.79-4.6-1.97-6.5-2.76a60.01 60.01 0 01-9.18-5.92c-1.91-1.58-3.83-3.16-5.36-4.73l-54.3-69.45-108.2-138.88a53.42 53.42 0 01-8.8-23.28c-.38-1.58-.38-3.16-.38-4.74 0-3.55 0-6.7.76-10.25l58.12-262a25.64 25.64 0 012.3-7.1c2.67-6.7 6.88-12.23 12.23-16.96l-6.88-14.2a57.53 57.53 0 00-22.56 34.71l-58.12 262v.79c-3.06 17.75 1.14 35.5 11.09 50.1l.38.4.38.4L175.51 683.4l.39.79.76.4a69.82 69.82 0 0045.5 21.3h130.78v-15.78H222.93z"/>
        <path fill="#FFF" fill-rule="nonzero" d="M352.94 690.12v15.78h58.88z"/>
        <path fill="#00797F" fill-rule="nonzero"
              d="M289.85 561.1l-79.16-166.5L88.33 140.88a41.68 41.68 0 00-12.24 16.96l-2.29 7.1-57.74 262c-.76 3.55-.76 6.7-.76 10.25 0 1.58 0 3.16.38 5.13a57.43 57.43 0 008.8 23.28L133.06 604.5l54.3 68.65c1.53 1.58 3.44 3.16 5.35 4.74a37.08 37.08 0 009.18 5.92c2.3 1.18 4.2 1.97 6.5 2.76l3.44 1.18c1.91.79 4.2 1.18 6.5 1.58 1.53.4 3.44.4 4.97.4h130.01L290.99 559.9l-1.14 1.19z"/>
        <path d="M15.3 437.2c0-3.55 0-6.7 1.9-10.25"/>
        <path fill="#00797F" fill-rule="nonzero"
              d="M196.93 683.41c-3.42-3.29-6.83-6.58-9.56-9.86 2.73 3.28 6.14 6.57 9.56 9.86z"/>
        <path d="M202.28 687.75a68.7 68.7 0 01-9.56-9.86M187.37 673.15l-54.3-69.05M217 689.92l-8.6-2.96"/>
        <path fill="#00797F" fill-rule="nonzero"
              d="M211.46 691.1c-3.38-1.97-6.75-4.93-9.56-6.9 2.8 1.97 6.18 4.93 9.56 6.9z"/>
        <path fill="#3ACCC5" fill-rule="nonzero"
              d="M570.13 247.42l-43.6 88.78-11.84 24.46a8.68 8.68 0 01-1.15 1.97l-35.18 71.42-20.65 42.61c-.38.79-1.15 1.97-1.53 2.76l-27.91 57.21c0 .4 0 .4-.39.8l-13.76 28.4c-.38.79-1.15 1.97-1.53 2.76l-59.27 120.74h129.63c3.06 0 6.5-.4 9.56-.79a39.8 39.8 0 0026-15.78l92.54-117.98 70.35-89.96a52.2 52.2 0 007.65-16.96c.38-.8.38-1.58.38-2.37a36.9 36.9 0 001.15-9.08c0-3.55 0-6.7-.38-10.25l-58.5-259.63c-.39-1.57-1.15-3.15-1.54-4.73-2.29-5.52-6.11-10.65-10.32-15l-47.03 95.49-2.68 5.13z"/>
        <path d="M692.3 437.2c0 3.43-1.91 6.44-2.87 9.87M692.68 448.65c-1.9 3.45-3.82 6.9-6.69 9.86M492.12 689.33a39.8 39.8 0 0026-15.78l92.54-117.98M690.58 426.95c.96 3.55.96 6.7.96 10.25"/>
        <path fill="#FFF" fill-rule="nonzero"
              d="M397.68 317.26c-9.18-5.13-21.03-1.58-26 8.28L343 381.18c-4.97 9.47-1.53 21.7 8.03 26.83 9.17 5.13 21.03 1.57 26-8.29l28.68-55.63c4.97-9.47 1.14-21.7-8.03-26.83zM419.09 511.38a19.03 19.03 0 00-25.62 8.68l-13.77 28.41c-4.58 9.86-.76 21.7 8.8 26.44 8.41 4.34 18.35 1.57 23.7-5.92l15.68-31.96c4.21-9.47.39-20.91-8.79-25.65zM427.88 537.82c0-.4 0-.4.39-.8L412.59 569a6.41 6.41 0 001.53-2.76l13.76-28.41z"/>
        <path fill="#FFF" fill-rule="nonzero"
              d="M311.64 519.27l27.91-54.05c4.98-9.47 1.53-21.7-8.03-26.83-9.17-5.13-21.03-1.58-26 8.28l-15.3 29.99L182.4 240.32h68.44l62.71 119.94.77-.4 21.03-40.63-61.95-118.37H118.54L210.3 394.2l79.92 165.71 21.41-40.64z"/>
        <path fill="#FFF" fill-rule="nonzero"
              d="M290.23 560.31l-79.54-165.72 79.16 166.51zM591.54 203.23h-79.91c-10.71 0-19.12 8.68-19.12 19.73 0 11.04 8.41 19.72 19.12 19.72h22.94c2.3 10.66 12.62 17.37 22.94 15a19.5 19.5 0 0012.62-9.47l2.68-5.53 18.73-39.45zM576.82 242.29l-6.69 9.86.96-.7zM541.83 304.63c4.98-9.86 1.15-21.7-8.4-26.44-9.57-4.73-21.04-1.18-25.63 8.69v.39l-27.15 56.42c-4.59 9.87-.76 21.7 8.8 26.44 8.41 4.34 18.73 1.58 24.09-6.71l13-26.83 15.3-31.96z"/>
        <path fill="#FFF" fill-rule="nonzero"
              d="M526.54 336.59l-13 26.83c.38-.79.76-1.58 1.15-1.97l11.85-24.86zM484.86 421.03c4.59-9.87.76-21.7-8.41-26.44-9.18-4.73-21.03-.79-25.62 8.68l-27.15 56.42c-4.59 9.87-.77 21.7 8.8 26.44 8.4 4.34 18.35 1.58 23.7-5.92l22.18-45.37 6.5-13.81z"/>
        <path fill="#FFF" fill-rule="nonzero"
              d="M478.36 434.84l-22.18 45.37c.77-.79 1.15-1.97 1.53-2.76l20.65-42.61zM456.56 202.44a17.34 17.34 0 00-8.8-2.37h-11.85l-33.64 66.29a20.15 20.15 0 004.97 27.62c8.8 6.31 20.64 3.94 26.76-5.13.77-1.19 1.53-2.37 1.91-3.95l28.68-55.63c4.97-9.86 1.53-21.7-8.03-26.83.39 0 0 0 0 0z"/>
    </g>
</svg>