[release-v1.14] Add func v1.15 (#432)

* [release-v1.14] Add func v1.15

* Fix default util image and func patch version

hack/build.sh.d/func.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# There no midstream image currently, fallback to upstream one.
+readonly func_util_image="${KN_PLUGIN_FUNC_UTIL_IMAGE:-ghcr.io/knative/func-utils:latest}"
+readonly func_repo_ref="${FUNC_REPO_REF:-openshift-knative/kn-plugin-func}"
+readonly func_repo_branch_ref="${FUNC_REPO_BRANCH_REF:-serverless-1.33}"
+readonly default_node_builder_image="${DEFAULT_NODE_BUILDER_IMAGE:-registry.access.redhat.com/ubi8/nodejs-20-minimal}"
+readonly default_quarkus_builder_image="${DEFAULT_QUARKUS_BUILDER_IMAGE:-registry.access.redhat.com/ubi8/openjdk-21}"
+readonly default_python_builder_image="${DEFAULT_PYTHON_BUILDER_IMAGE:-registry.access.redhat.com/ubi8/python-39}"
+
+export EXTERNAL_LD_FLAGS="${EXTERNAL_LD_FLAGS:-} \
+-X knative.dev/func/pkg/k8s.SocatImage=${func_util_image} \
+-X knative.dev/func/pkg/k8s.TarImage=${func_util_image} \
+-X knative.dev/func/pkg/pipelines/tekton.FuncUtilImage=${func_util_image}
+-X knative.dev/func/pkg/builders/s2i.DefaultNodeBuilder=${default_node_builder_image} \
+-X knative.dev/func/pkg/builders/s2i.DefaultQuarkusBuilder=${default_quarkus_builder_image} \
+-X knative.dev/func/pkg/builders/s2i.DefaultPythonBuilder=${default_python_builder_image}"

hack/build.sh.d/kn-plugin-event.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+knEventVersion="$(grep 'knative.dev/kn-plugin-event ' "$(basedir)/go.mod" \
+  | head -n 1 \
+  | sed -sE 's/.* (v[0-9]+\.[0-9]+\.[0-9]+.*)/\1/')"
+knEventRelease="${knEventVersion%.*}"
+knEventRelease="${knEventRelease#v}"
+readonly upstream_sender_image="registry.ci.openshift.org/knative/release-${knEventRelease}:client-plugin-event-sender"
+readonly sender_image="${KN_PLUGIN_EVENT_SENDER_IMAGE:-${upstream_sender_image}}"
+export EXTERNAL_LD_FLAGS="${EXTERNAL_LD_FLAGS:-} \
+-X knative.dev/kn-plugin-event/pkg/metadata.Image=${sender_image} \
+-X knative.dev/kn-plugin-event/pkg/metadata.Version=${knEventVersion}"

openshift/release/kn.yaml

@@ -11,12 +11,11 @@ plugins:
       - module: knative.dev/kn-plugin-event
         moduleSource: github.com/openshift-knative/kn-plugin-event
         version: release-1.14
-  # - name: kn-plugin-func
-  #   module: knative.dev/func
-  #   pluginImportPath: knative.dev/func/plugin
-  #   version: v1.15.0
-  #   replace:
-  #     - module: knative.dev/func
-  #       moduleSource: github.com/openshift-knative/kn-plugin-func
-  #       version: serverless-1.34
-
+  - name: kn-plugin-func
+    module: knative.dev/func
+    pluginImportPath: knative.dev/func/plugin
+    version: v1.15.1
+    replace:
+      - module: knative.dev/func
+        moduleSource: github.com/openshift-knative/kn-plugin-func
+        version: serverless-1.34

pkg/kn/root/plugin_register.go

@@ -18,6 +18,7 @@ package root
 
 import (
 	// Add #plugins# import here. Don't remove this line, it triggers an automatic replacement.
+    _ "knative.dev/func/plugin"
 	_ "knative.dev/kn-plugin-event/pkg/plugin"
 	_ "knative.dev/kn-plugin-source-kafka/plugin"
 )