upgrade to latest dependencies (#952)

bumping knative.dev/networking e9a822c...17b4f7b: > 17b4f7b upgrade to latest dependencies (# 852) bumping knative.dev/hack 9cc05a3...760813a: > 760813a Allow to not vendor the dependencies (# 311) > f63d16e 🎁 Source embedded hack scripts (# 222) Signed-off-by: Knative Automation <[email protected]>
knative-extensions · Sep 7, 2023 · 8c3eacb · 8c3eacb
1 parent 046d42b
commit 8c3eacb
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 30 deletions.
diff --git a/go.mod b/go.mod
@@ -15,8 +15,8 @@ require (
 	k8s.io/api v0.26.5
 	k8s.io/apimachinery v0.27.1
 	k8s.io/client-go v0.26.5
-	knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0
-	knative.dev/networking v0.0.0-20230905021116-e9a822c09ff2
+	knative.dev/hack v0.0.0-20230906172513-760813ad2706
+	knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a
 	knative.dev/pkg v0.0.0-20230905144417-27252a376b30
 	sigs.k8s.io/yaml v1.3.0
 )

diff --git a/go.sum b/go.sum
@@ -706,10 +706,10 @@ k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOG
 k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
 k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
 k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0 h1:n9YEGYuoj31pAkhGlNL+xTQAeXKYTLeMmIZLWA9fAeo=
-knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
-knative.dev/networking v0.0.0-20230905021116-e9a822c09ff2 h1:hNCieED2OWh2yFReHqHjzF5UVfPPpHXT+pV3Zz6b+bg=
-knative.dev/networking v0.0.0-20230905021116-e9a822c09ff2/go.mod h1:3ZBj59GyKsN7vh9GMii4A3Dfbg4VwbNzHkUmj6wNCxs=
+knative.dev/hack v0.0.0-20230906172513-760813ad2706 h1:5/b4gPIUUNqVFkDKO9AMnEkdUvZrFVqf+z3r5rJ9w/U=
+knative.dev/hack v0.0.0-20230906172513-760813ad2706/go.mod h1:dx0YG3YWqJu653e9tjcT0Q1ZdS9JJXLKbUhzr4EB0g8=
+knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a h1:xiF0cQfHuo0qBoaSeXjyk+56Cu1gYv0ezu6qMx9E8us=
+knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a/go.mod h1:nXiCx9KmJ5WgDofa8zOXA5poIQe8GeBL/neZtQyfobg=
 knative.dev/pkg v0.0.0-20230905144417-27252a376b30 h1:q8OCYCux80XnBIscEUTyK9kMAM5cYhPMXlU0b77maz0=
 knative.dev/pkg v0.0.0-20230905144417-27252a376b30/go.mod h1:KOCW7iby+PL0aSDG2Ta7Vf1kCn+VAqL7QaTyK0c4fuk=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

diff --git a/vendor/knative.dev/hack/hack.go → vendor/knative.dev/hack/embed.go b/vendor/knative.dev/hack/hack.go → vendor/knative.dev/hack/embed.go
@@ -1,8 +1,5 @@
-//go:build hack
-// +build hack
-
 /*
-Copyright 2020 The Knative Authors
+Copyright 2022 The Knative Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// package hack is a collection of scripts used to bootstrap CI processes and
-// other vital entrypoint functionality.
-
 package hack
+
+import "embed"
+
+//go:embed *.sh
+var Scripts embed.FS
diff --git a/vendor/knative.dev/hack/go.work b/vendor/knative.dev/hack/go.work
@@ -4,4 +4,5 @@ use (
 	.
 	schema
 	test
+	test/vendorproj
 )
diff --git a/vendor/knative.dev/hack/go.work.sum b/vendor/knative.dev/hack/go.work.sum
@@ -1,12 +1,2 @@
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-k8s.io/apimachinery v0.20.6 h1:R5p3SlhaABYShQSO6LpPsYHjV05Q+79eBUR0Ut/f4tk=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
-sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.3 h1:4oyYo8NREp49LBBhKxEqCulFjg26rawYKrnCmg+Sr6c=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
diff --git a/vendor/knative.dev/hack/infra-library.sh b/vendor/knative.dev/hack/infra-library.sh
@@ -157,7 +157,7 @@ function create_gke_test_cluster() {
     --v=1 \
     --network=e2e-network \
     --boskos-acquire-timeout-seconds=1200 \
-    --region="${E2E_CLUSTER_REGION},us-east1,us-west1" \
+    --region="${E2E_CLUSTER_REGION:-us-central1},us-east1,us-west1" \
     --gcloud-extra-flags="${_extra_gcloud_flags[*]}" \
     --retryable-error-patterns='.*does not have enough resources available to fulfill.*,.*only \\d+ nodes out of \\d+ have registered; this is likely due to Nodes failing to start correctly.*,.*All cluster resources were brought up.+ but: component .+ from endpoint .+ is unhealthy.*' \
     --test=exec \

diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh
@@ -718,18 +718,23 @@ function __go_update_deps_for_module() {
     fi
   fi
 
-  group "Go mod tidy and vendor"
+  group "Go mod tidy"
 
   # Prune modules.
-  local orig_pipefail_opt=$(shopt -p -o pipefail)
+  local orig_pipefail_opt
+  orig_pipefail_opt=$(shopt -p -o pipefail)
   set -o pipefail
   go mod tidy 2>&1 | grep -v "ignoring symlink" || true
-  go mod vendor 2>&1 |  grep -v "ignoring symlink" || true
+  if [[ "${FORCE_VENDOR:-false}" == "true" ]] || [ -d vendor ]; then
+    group "Go mod vendor"
+    go mod vendor 2>&1 |  grep -v "ignoring symlink" || true
+  fi
   eval "$orig_pipefail_opt"
 
-  if ! [ -d vendor ]; then
+  if ! [[ "${FORCE_VENDOR:-false}" == "true" ]] && ! [ -d vendor ]; then
     return 0
   fi
+
   group "Removing unwanted vendor files"
 
   # Remove unwanted vendor files

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -890,10 +890,10 @@ k8s.io/utils/net
 k8s.io/utils/pointer
 k8s.io/utils/strings/slices
 k8s.io/utils/trace
-# knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0
+# knative.dev/hack v0.0.0-20230906172513-760813ad2706
 ## explicit; go 1.18
 knative.dev/hack
-# knative.dev/networking v0.0.0-20230905021116-e9a822c09ff2
+# knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a
 ## explicit; go 1.18
 knative.dev/networking/config
 knative.dev/networking/pkg