[release-v1.14] Update func to latest midstream (knative#466)

* [release-v1.14] Update func to latest midstream * Update S-O branch
matejvasek · Oct 3, 2024 · d4911e1 · d4911e1
1 parent 8071576
commit d4911e1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -289,7 +289,7 @@ require (
 replace (
 	k8s.io/client-go => k8s.io/client-go v0.29.3
 	knative.dev/eventing => knative.dev/eventing v0.41.0
-	knative.dev/func => github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241001182440-a3e64ddd720e
+	knative.dev/func => github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241003082231-25c6d78a7626
 	knative.dev/hack => knative.dev/hack v0.0.0-20240404013450-1133b37da8d7
 	knative.dev/kn-plugin-event => github.com/openshift-knative/kn-plugin-event v0.41.1-0.20240628014724-95e8b1e98fe0
 	knative.dev/networking => knative.dev/networking v0.0.0-20240418213116-979f63728302

diff --git a/go.sum b/go.sum
@@ -1484,8 +1484,8 @@ github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaL
 github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
 github.com/openshift-knative/kn-plugin-event v0.41.1-0.20240628014724-95e8b1e98fe0 h1:kxJHcfXmmvOTQpPbkSXyKs2f/VrhYWeFFIRHN/7nHLE=
 github.com/openshift-knative/kn-plugin-event v0.41.1-0.20240628014724-95e8b1e98fe0/go.mod h1:GqjLZQDAULerite/+Va3rcFWSXDdmy8tBYeBGubem3E=
-github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241001182440-a3e64ddd720e h1:cYK40JRa9fV7yjZZbe0KxyG/3lSPOmRnvjSP8wYVpCA=
-github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241001182440-a3e64ddd720e/go.mod h1:1zDdXQg49k386+HSijg2CPsF/O9m44KJ+5JL/VyzgfA=
+github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241003082231-25c6d78a7626 h1:B5QwoNApxW+y2AbM/u2L//32DI9XrgfeVMgjsPpLF5Q=
+github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241003082231-25c6d78a7626/go.mod h1:1zDdXQg49k386+HSijg2CPsF/O9m44KJ+5JL/VyzgfA=
 github.com/openshift-pipelines/pipelines-as-code v0.27.0 h1:uxpva7/Ad/QEvc40BCBFEWrmYlAjCZ9dZCFYPYWW61c=
 github.com/openshift-pipelines/pipelines-as-code v0.27.0/go.mod h1:rzfXtaqbUrsAock3f948p9ekXWc3DFFk9acz5BsEwA4=
 github.com/openshift/source-to-image v1.4.1-0.20240605122348-f94ff357628b h1:FGmtvZdOUj8+oEmL773UwU348D1mx42KHSqFoEAXwtw=

diff --git a/openshift/e2e-common.sh b/openshift/e2e-common.sh
@@ -31,7 +31,7 @@ readonly SERVING_BRANCH="release-next"
 readonly EVENTING_BRANCH="release-next"
 
 # The value should be updated once S-O release branch is cut
-readonly SERVERLESS_BRANCH="serverless-1.33"
+readonly SERVERLESS_BRANCH="serverless-1.34"
 
 # Determine if we're running locally or in CI.
 if [ -n "$OPENSHIFT_BUILD_NAMESPACE" ]; then

diff --git a/vendor/knative.dev/func/pkg/pipelines/tekton/tasks.go b/vendor/knative.dev/func/pkg/pipelines/tekton/tasks.go
@@ -286,6 +286,7 @@ spec:
       description: Reference of the image S2I will produce.
     - name: REGISTRY
       description: The registry associated with the function image.
+      default: ""
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
       default: .

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -2041,7 +2041,7 @@ knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1
 knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/scheme
 knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1beta1
 knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1beta1/fake
-# knative.dev/func v1.15.1 => github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241001182440-a3e64ddd720e
+# knative.dev/func v1.15.1 => github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241003082231-25c6d78a7626
 ## explicit; go 1.22.0
 knative.dev/func/cmd
 knative.dev/func/cmd/prompt
@@ -2296,7 +2296,7 @@ sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
 # k8s.io/client-go => k8s.io/client-go v0.29.3
 # knative.dev/eventing => knative.dev/eventing v0.41.0
-# knative.dev/func => github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241001182440-a3e64ddd720e
+# knative.dev/func => github.com/openshift-knative/kn-plugin-func v1.1.3-0.20241003082231-25c6d78a7626
 # knative.dev/hack => knative.dev/hack v0.0.0-20240404013450-1133b37da8d7
 # knative.dev/kn-plugin-event => github.com/openshift-knative/kn-plugin-event v0.41.1-0.20240628014724-95e8b1e98fe0
 # knative.dev/networking => knative.dev/networking v0.0.0-20240418213116-979f63728302