Remove S2I image from CSV (#3477)

Author: creydr

hack/generate/csv.sh

@@ -131,7 +131,6 @@ image 'KN_PLUGIN_EVENT_SENDER'   "${KNATIVE_KN_PLUGIN_EVENT_SENDER}"
 image 'KN_CLIENT'                "${KNATIVE_KN_CLIENT}"
 
 image "KN_PLUGIN_FUNC_UTIL"               "${KNATIVE_KN_PLUGIN_FUNC_FUNC_UTIL}"
-image "KN_PLUGIN_FUNC_TEKTON_S2I"         "${KNATIVE_KN_PLUGIN_FUNC_TEKTON_S2I}"
 image "KN_PLUGIN_FUNC_TEKTON_BUILDAH"     "${KNATIVE_KN_PLUGIN_FUNC_TEKTON_BUILDAH}"
 image "KN_PLUGIN_FUNC_NODEJS_20_MINIMAL"  "${KNATIVE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL}"
 image "KN_PLUGIN_FUNC_OPENJDK_21"         "${KNATIVE_KN_PLUGIN_FUNC_OPENJDK_21}"

hack/lib/images.bash

@@ -234,7 +234,6 @@ function knative_kn_plugin_func_images() {
 
   export KNATIVE_KN_PLUGIN_FUNC_FUNC_UTIL=${KNATIVE_KN_PLUGIN_FUNC_FUNC_UTIL:-$(latest_registry_redhat_io_image_sha "${knative_kn_plugin_func}-func-util:${tag}")}
 
-  export KNATIVE_KN_PLUGIN_FUNC_TEKTON_S2I=${KNATIVE_KN_PLUGIN_FUNC_UTIL:-"$(metadata.get dependencies.func.tekton_s2i)"}
   export KNATIVE_KN_PLUGIN_FUNC_TEKTON_BUILDAH=${KNATIVE_KN_PLUGIN_FUNC_UTIL:-"$(metadata.get dependencies.func.tekton_buildah)"}
   export KNATIVE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL=${KNATIVE_KN_PLUGIN_FUNC_UTIL:-"$(metadata.get dependencies.func.nodejs_20_minimal)"}
   export KNATIVE_KN_PLUGIN_FUNC_OPENJDK_21=${KNATIVE_KN_PLUGIN_FUNC_UTIL:-"$(metadata.get dependencies.func.openjdk_21)"}

olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml

@@ -145,7 +145,7 @@ spec:
     Knative Functions bring greater efficiency, more scalability and faster development to facilitate rapid go-to-market.
 
     Other features include:
-    - Build strategies including Source-to-Image (S2I) and Buildpacks
+    - Buildpacks
     - Multiple runtimes, including Node.js, Quarkus and Go
     - Local developer experience through the kn CLI
     - Project templates
@@ -940,8 +940,6 @@ spec:
                         value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:a4fce6b96bfd5d560a43f261afdbf2d02d4256a2cc11ea652513af41bb9b6445"
                       - name: "IMAGE_KN_PLUGIN_FUNC_UTIL"
                         value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:6aa2ba3fd2bc759fa67392afbc68cb1c4c656d20c3f14e2640271b915e7ef74d"
-                      - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_S2I"
-                        value: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4"
                       - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH"
                         value: "registry.redhat.io/rhel8/buildah@sha256:3d505d9c0f5d4cd5a4ec03b8d038656c6cdbdf5191e00ce6388f7e0e4d2f1b74"
                       - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL"
@@ -1114,8 +1112,6 @@ spec:
                         value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:a4fce6b96bfd5d560a43f261afdbf2d02d4256a2cc11ea652513af41bb9b6445"
                       - name: "IMAGE_KN_PLUGIN_FUNC_UTIL"
                         value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:6aa2ba3fd2bc759fa67392afbc68cb1c4c656d20c3f14e2640271b915e7ef74d"
-                      - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_S2I"
-                        value: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4"
                       - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH"
                         value: "registry.redhat.io/rhel8/buildah@sha256:3d505d9c0f5d4cd5a4ec03b8d038656c6cdbdf5191e00ce6388f7e0e4d2f1b74"
                       - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL"
@@ -1391,8 +1387,6 @@ spec:
       image: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:a4fce6b96bfd5d560a43f261afdbf2d02d4256a2cc11ea652513af41bb9b6445"
     - name: "IMAGE_KN_PLUGIN_FUNC_UTIL"
       image: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:6aa2ba3fd2bc759fa67392afbc68cb1c4c656d20c3f14e2640271b915e7ef74d"
-    - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_S2I"
-      image: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4"
     - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH"
       image: "registry.redhat.io/rhel8/buildah@sha256:3d505d9c0f5d4cd5a4ec03b8d038656c6cdbdf5191e00ce6388f7e0e4d2f1b74"
     - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL"

olm-catalog/serverless-operator/project.yaml

@@ -63,7 +63,6 @@ dependencies:
   kube_rbac_proxy: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:5b67b8c6cb34967feb1c504007f4f5914b0ebb2898e5ff725b14386af9752533
   func:
     promotion_tag: knative-v1.16
-    tekton_s2i: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4
     tekton_buildah: registry.redhat.io/rhel8/buildah@sha256:3d505d9c0f5d4cd5a4ec03b8d038656c6cdbdf5191e00ce6388f7e0e4d2f1b74
     nodejs_20_minimal: registry.access.redhat.com/ubi8/nodejs-20-minimal@sha256:a2a7e399aaf09a48c28f40820da16709b62aee6f2bc703116b9345fab5830861
     openjdk_21: registry.access.redhat.com/ubi8/openjdk-21@sha256:441897a1f691c7d4b3a67bb3e0fea83e18352214264cb383fd057bbbd5ed863c

templates/csv.yaml

@@ -144,7 +144,7 @@ spec:
     Knative Functions bring greater efficiency, more scalability and faster development to facilitate rapid go-to-market.
 
     Other features include:
-    - Build strategies including Source-to-Image (S2I) and Buildpacks
+    - Buildpacks
     - Multiple runtimes, including Node.js, Quarkus and Go
     - Local developer experience through the kn CLI
     - Project templates