Introduce 'run-opm-command' in the fbc pipeline

Author: rauhersu

.konflux/Dockerfile.catalog

@@ -1,39 +1,5 @@
 # The opm image is expected to contain /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
 ARG OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18
-ARG BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
-
-# build the catalog
-FROM ${BUILDER_IMAGE} AS builder
-
-# create dir structure to generate the catalog
-RUN mkdir -p /app/hack /app/.konflux/catalog
-COPY Makefile /app
-COPY .konflux/catalog/ /app/.konflux/catalog/
-COPY telco5g-konflux /app/telco5g-konflux
-
-# we need to copy the vendor/ folder as the Makefile depends on it
-COPY vendor/ /app/vendor/
-
-# generate the catalog
-
-# debug
-RUN echo "root dir" && ls -lra $HOME
-
-WORKDIR /app
-RUN --mount=type=secret,id=telco-5g-redhat-pull-secret/.dockerconfigjson \
-    mkdir -p $HOME/.docker/ && \
-    cp /run/secrets/telco-5g-redhat-pull-secret/.dockerconfigjson $HOME/.docker/config.json
-
-# debug
-RUN echo "run secrets" && ls -lra /run/secrets/ && echo "docker dir" && ls -lra $HOME/.docker/ && cat $HOME/.docker/config.json
-
-ENV REGISTRY_AUTH_FILE=$HOME/.docker/config.json
-
-# The Konflux build is not hermetic so it will download the tools (opm, yq, etc) automatically
-# Konflux will externally sync the submodules so we can skip it here
-RUN SKIP_SUBMODULE_SYNC=yes make konflux-generate-catalog-production && \
-    rm -f $HOME/.docker/config.json
-
 # run the catalog
 FROM ${OPM_IMAGE}
 
@@ -43,7 +9,7 @@ CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
 # ensure this correponds to olm.package name
 ENV PACKAGE_NAME=topology-aware-lifecycle-manager
 
-COPY --from=builder /app/.konflux/catalog/$PACKAGE_NAME/ /configs/$PACKAGE_NAME
+COPY .konflux/catalog/$PACKAGE_NAME/ /configs/$PACKAGE_NAME
 # RUN ["/bin/opm", "validate", "/configs/topology-aware-lifecycle-manager"]
 RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
 

.konflux/catalog/catalog-template.in.yaml

@@ -46,7 +46,7 @@ entries:
   - image: registry.redhat.io/openshift4/topology-aware-lifecycle-manager-operator-bundle:v4.18.1
     schema: olm.bundle
   # v4.18.2 bundle
-  # The url for this last entry is updated by telco5g-konflux/scripts/catalog/update-catalog-template.sh automatically
-  - image: placeholder.will.be.updated.by.telco5g-konflux.scripts.catalog.update-catalog-template.sh
+  # Setting the image here for now, bypassing the previous bundle.builds.in.yaml logic
+  - image: quay.io/redhat-user-workloads/telco-5g-tenant/topology-aware-lifecycle-manager-bundle-4-18@sha256:f4e7d4192987460413b8c1c71b62cd09a1e8951a1721c08e550efc2ea5e85af5
     schema: olm.bundle
 schema: olm.template.basic

.tekton/fbc-pipeline.yaml

@@ -148,18 +148,47 @@ spec:
       workspaces:
         - name: basic-auth
           workspace: git-auth
+    - name: run-opm-command
+      params:
+        - name: SOURCE_ARTIFACT
+          value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
+        - name: ociStorage
+          value: $(params.output-image).opm
+        - name: ociArtifactExpiresAfter
+          value: $(params.image-expires-after)
+        - name: OPM_ARGS
+          value:
+            - alpha
+            - render-template
+            - basic
+            # arg for OCP 4.17 and newer
+            - "--migrate-level=bundle-object-to-csv-metadata"
+            - ".konflux/catalog/catalog-template.in.yaml"
+        - name: OPM_OUTPUT_PATH
+          value: ".konflux/catalog/topology-aware-lifecycle-manager/catalog.json"
+      runAfter:
+        - clone-repository
+      taskRef:
+        params:
+          - name: name
+            value: run-opm-command-oci-ta
+          - name: bundle
+            value: quay.io/konflux-ci/tekton-catalog/task-run-opm-command-oci-ta:0.1@sha256:4ab5dba35166a976c3d6293913501fdfc79a3222395388fc6208641ab8bc9359
+          - name: kind
+            value: task
+        resolver: bundles
     - name: prefetch-dependencies
       params:
         - name: input
           value: $(params.prefetch-input)
         - name: SOURCE_ARTIFACT
-          value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
+          value: $(tasks.run-opm-command.SOURCE_ARTIFACT)
         - name: ociStorage
           value: $(params.output-image).prefetch
         - name: ociArtifactExpiresAfter
           value: $(params.image-expires-after)
       runAfter:
-        - clone-repository
+        - run-opm-command
       taskRef:
         params:
           - name: name