index: update konflux configuration… and…

… try to get a build green.

Signed-off-by: Vincent Demeester <[email protected]>

.konflux/main/component-bundle.yaml

@@ -8,8 +8,8 @@ metadata:
 spec:
   componentName: bundle
   application: operator-main
-  # build-nudges-ref:
-  #   - openshift-pipelines-index
+  build-nudges-ref:
+    - operator-main-index
   source:
     git:
       url: https://github.com/openshift-pipelines/operator.git

.konflux/main/component-index.yaml

@@ -7,10 +7,10 @@ metadata:
     appstudio.openshift.io/pac-provision: request
     build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}'
     build.appstudio.openshift.io/request: configure-pac
-  name: openshift-pipelines-index
+  name: operator-main-index
 spec:
-  componentName: openshift-pipelines-index
-  application: openshift-pipelines-operator
+  componentName: operator-main-index
+  application: operator
   source:
     git:
       url: https://github.com/openshift-pipelines/operator.git

.konflux/main/image-index.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: ImageRepository
+metadata:
+  name: operator-main-index
+  annotations:
+    image-controller.appstudio.redhat.com/update-component-image: "true"
+  labels:
+    appstudio.redhat.com/component: operator-main-index
+    appstudio.redhat.com/application: operator-main
+spec:
+  image:
+   name: operator-main/index
+   visibility: public

openshift/olm-catalog/index/Dockerfile

@@ -1,19 +1,18 @@
 FROM registry.ci.openshift.org/origin/4.15:operator-registry AS opm
-
 FROM registry.access.redhat.com/ubi9/ubi-minimal AS builder
 
 COPY --from=opm /bin/opm /bin/opm
 
 # Copy declarative config root into image at /configs
-COPY olm-catalog/openshift-pipelines/index/configs /configs
-
-RUN /bin/opm init openshift-pipelines-operator --default-channel=latest --output yaml >> /configs/index.yaml
-RUN /bin/opm render --skip-tls-verify -o yaml registry.ci.openshift.org/knative/openshift-serverless-v1.31.0:serverless-bundle \
-      registry.ci.openshift.org/knative/release-1.32.0:serverless-bundle \
-      registry.ci.openshift.org/knative/release-1.33.0:serverless-bundle >> /configs/index.yaml || \
-    /bin/opm render --skip-tls-verify -o yaml registry.ci.openshift.org/knative/openshift-serverless-v1.31.0:serverless-bundle \
-      registry.ci.openshift.org/knative/release-1.32.0:serverless-bundle \
-      registry.ci.openshift.org/knative/serverless-bundle:main >> /configs/index.yaml
+COPY openshift/olm-catalog/index/configs /configs
+
+# RUN /bin/opm init openshift-pipelines-operator --default-channel=latest --output yaml >> /configs/index.yaml
+RUN /bin/opm render --skip-tls-verify -o yaml quay.io/redhat-user-workloads/tekton-ecosystem-tenant/operator-main/bundle@sha256:32d9e64363e7da35efafe8e24c67fa8732a9493c856dcab785d75dd59cd8a5da > /configs/nightly-bundle.yaml
+RUN export BUNDLE_VERSION=$(cat /configs/nightly-bundle.yaml | grep 'name: openshift-pipelines-operator-rh' | awk '{print $2}') && \
+    echo $BUNDLE_VERSION && \
+    sed -i "s%name: \"openshift-pipelines-operator-rh.*\"%name: \"${BUNDLE_VERSION}\"%g" /configs/index.yaml && \
+    cat /configs/index.yaml
+RUN /bin/opm validate configs
 
 # The base image is expected to contain
 # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe

openshift/olm-catalog/index/configs.sample/index.yaml

@@ -0,0 +1,42 @@
+---
+schema: olm.channel
+name: latest
+package: openshift-pipelines-operator-rh
+entries:
+  - name: "openshift-pipelines-operator-rh.v1.16.0"
+    replaces: "openshift-pipelines-operator-rh.v1.15.0"
+    skipRange: ">=1.15.0 <1.16.0"
+---
+schema: olm.channel
+name: pipelines-1.16
+package: openshift-pipelines-operator-rh
+entries:
+  - name: "openshift-pipelines-operator-rh.v1.16.0"
+    replaces: "openshift-pipelines-operator-rh.v1.15.0"
+    skipRange: ">=1.15.0 <1.16.0"
+  - name: "openshift-pipelines-operator-rh.v1.15.0"
+    replaces: "openshift-pipelines-operator-rh.v1.14.0"
+    skipRange: ">=1.14.0 <1.15.0"
+  - name: "openshift-pipelines-operator-rh.v1.14.0"
+---
+schema: olm.channel
+name: pipelines-1.15
+package: openshift-pipelines-operator-rh
+entries:
+  - name: "openshift-pipelines-operator-rh.v1.15.2"
+    replaces: "openshift-pipelines-operator-rh.v1.14.0"
+    skipRange: ">=1.14.0 <1.15.0"
+  - name: "openshift-pipelines-operator-rh.v1.14.0"
+---
+schema: olm.channel
+name: pipelines-1.14
+package: openshift-pipelines-operator-rh
+entries:
+  - name: "openshift-pipelines-operator-rh.v1.14.5"
+    replaces: "openshift-pipelines-operator-rh.v1.14.4"
+    skipRange: ">=1.13.0 <1.14.5"
+  - name: "openshift-pipelines-operator-rh.v1.14.4"
+---
+defaultChannel: latest
+name: openshift-pipelines-operator-rh
+schema: olm.package

openshift/olm-catalog/index/configs/index.yaml

@@ -3,39 +3,7 @@ schema: olm.channel
 name: latest
 package: openshift-pipelines-operator-rh
 entries:
-  - name: "openshift-pipelines-operator-rh.v1.16.0"
-    replaces: "openshift-pipelines-operator-rh.v1.15.0"
-    skipRange: ">=1.15.0 <1.16.0"
----
-schema: olm.channel
-name: pipelines-1.16
-package: openshift-pipelines-operator-rh
-entries:
-  - name: "openshift-pipelines-operator-rh.v1.16.0"
-    replaces: "openshift-pipelines-operator-rh.v1.15.0"
-    skipRange: ">=1.15.0 <1.16.0"
-  - name: "openshift-pipelines-operator-rh.v1.15.0"
-    replaces: "openshift-pipelines-operator-rh.v1.14.0"
-    skipRange: ">=1.14.0 <1.15.0"
-  - name: "openshift-pipelines-operator-rh.v1.14.0"
----
-schema: olm.channel
-name: pipelines-1.15
-package: openshift-pipelines-operator-rh
-entries:
-  - name: "openshift-pipelines-operator-rh.v1.15.2"
-    replaces: "openshift-pipelines-operator-rh.v1.14.0"
-    skipRange: ">=1.14.0 <1.15.0"
-  - name: "openshift-pipelines-operator-rh.v1.14.0"
----
-schema: olm.channel
-name: pipelines-1.14
-package: openshift-pipelines-operator-rh
-entries:
-  - name: "openshift-pipelines-operator-rh.v1.14.5"
-    replaces: "openshift-pipelines-operator-rh.v1.14.4"
-    skipRange: ">=1.13.0 <1.14.5"
-  - name: "openshift-pipelines-operator-rh.v1.14.4"
+  - name: "openshift-pipelines-operator-rh.v5.0.5"
 ---
 defaultChannel: latest
 name: openshift-pipelines-operator-rh