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

dsimansk · Sep 30, 2024 · 7b541f3 · 7b541f3
1 parent beabff5
commit 7b541f3
Show file tree

Hide file tree

Showing 7 changed files with 10,353 additions and 10,352 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.20240912202911-faf7fbd561d4
+	knative.dev/func => github.com/openshift-knative/kn-plugin-func v1.1.3-0.20240927133900-9c86c1d6a8a0
 	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.20240912202911-faf7fbd561d4 h1:7MpjCveq93fETe9LO0kCGeLUH7sDz99fIL8ANCjDro8=
-github.com/openshift-knative/kn-plugin-func v1.1.3-0.20240912202911-faf7fbd561d4/go.mod h1:1zDdXQg49k386+HSijg2CPsF/O9m44KJ+5JL/VyzgfA=
+github.com/openshift-knative/kn-plugin-func v1.1.3-0.20240927133900-9c86c1d6a8a0 h1:0nc+m48FpX7vAd7iAdWfNw0n0EkiFmalYqqM60tgKbE=
+github.com/openshift-knative/kn-plugin-func v1.1.3-0.20240927133900-9c86c1d6a8a0/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/vendor/knative.dev/func/generate/zz_filesystem_generated.go b/vendor/knative.dev/func/generate/zz_filesystem_generated.go
diff --git a/vendor/knative.dev/func/pkg/builders/s2i/assemblers.go b/vendor/knative.dev/func/pkg/builders/s2i/assemblers.go
@@ -49,7 +49,7 @@ if [[ $(go list -f {{.Incomplete}}) == "true" ]]; then
     exec /$STI_SCRIPTS_PATH/usage
 else
     pushd .s2i/builds/last
-    go get f
+    go get function
     go build -o /opt/app-root/gobinary
     popd
     popd

diff --git a/vendor/knative.dev/func/pkg/functions/runner.go b/vendor/knative.dev/func/pkg/functions/runner.go
@@ -111,7 +111,7 @@ func runGo(ctx context.Context, job *Job) (err error) {
 	}
 
 	// Get the dependencies of the function
-	cmd := exec.CommandContext(ctx, "go", "get", "f")
+	cmd := exec.CommandContext(ctx, "go", "get", "function")
 	cmd.Dir = job.Dir()
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout

diff --git a/vendor/knative.dev/func/pkg/oci/containerize_go.go b/vendor/knative.dev/func/pkg/oci/containerize_go.go
@@ -66,7 +66,7 @@ func goBuild(cfg *buildConfig, p v1.Platform) (binPath string, err error) {
 	}
 
 	// Get the dependencies of the function
-	cmd := exec.CommandContext(cfg.ctx, gobin, "get", "f")
+	cmd := exec.CommandContext(cfg.ctx, gobin, "get", "function")
 	cmd.Env = envs
 	cmd.Dir = cfg.buildDir()
 	cmd.Stderr = os.Stderr

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.20240912202911-faf7fbd561d4
+# knative.dev/func v1.15.1 => github.com/openshift-knative/kn-plugin-func v1.1.3-0.20240927133900-9c86c1d6a8a0
 ## 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.20240912202911-faf7fbd561d4
+# knative.dev/func => github.com/openshift-knative/kn-plugin-func v1.1.3-0.20240927133900-9c86c1d6a8a0
 # 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