From d168facab471aadef3acae5e20ff423beb4ea310 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Thu, 7 Sep 2023 01:42:36 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/serving 815fe70...aeb4e94: > aeb4e94 Update net-contour nightly (# 14334) bumping knative.dev/hack 9cc05a3...760813a: > 760813a Allow to not vendor the dependencies (# 311) > f63d16e :gift: Source embedded hack scripts (# 222) bumping knative.dev/eventing e057e77...a7b39bc: > a7b39bc Add more benchmark test for All filter (# 7232) bumping knative.dev/caching dfea193...a6afde1: > a6afde1 upgrade to latest dependencies (# 780) Signed-off-by: Knative Automation --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- vendor/knative.dev/hack/{hack.go => embed.go} | 13 ++++++------- vendor/knative.dev/hack/go.work | 1 + vendor/knative.dev/hack/go.work.sum | 10 ---------- vendor/knative.dev/hack/infra-library.sh | 2 +- vendor/knative.dev/hack/library.sh | 13 +++++++++---- vendor/modules.txt | 8 ++++---- 8 files changed, 33 insertions(+), 38 deletions(-) rename vendor/knative.dev/hack/{hack.go => embed.go} (74%) diff --git a/go.mod b/go.mod index cf9448f82f..e4ae5674fb 100644 --- a/go.mod +++ b/go.mod @@ -21,11 +21,11 @@ require ( k8s.io/client-go v0.26.5 k8s.io/code-generator v0.26.5 k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 - knative.dev/caching v0.0.0-20230905124918-dfea1937ef85 - knative.dev/eventing v0.38.1-0.20230906050312-e057e77226b0 - knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0 + knative.dev/caching v0.0.0-20230906132213-a6afde1d97e9 + knative.dev/eventing v0.38.1-0.20230906134312-a7b39bc87990 + knative.dev/hack v0.0.0-20230906172513-760813ad2706 knative.dev/pkg v0.0.0-20230905144417-27252a376b30 - knative.dev/serving v0.38.1-0.20230906063212-815fe70fa08a + knative.dev/serving v0.38.1-0.20230906132413-aeb4e94d5752 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index e4f71c5b8f..74095566e5 100644 --- a/go.sum +++ b/go.sum @@ -1397,18 +1397,18 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/caching v0.0.0-20230905124918-dfea1937ef85 h1:7hUvxGol8lUzQwzYVt9xz8bDICPSWxQJ1XAcNjaLoHs= -knative.dev/caching v0.0.0-20230905124918-dfea1937ef85/go.mod h1:lax51NeHsQ4SDSSFzfg+8QLznQoTAWo/2fCG7JkbRYk= -knative.dev/eventing v0.38.1-0.20230906050312-e057e77226b0 h1:v3N2U/teahpGNG81xDyvhh45+OmtP/naMQPta60Ttsw= -knative.dev/eventing v0.38.1-0.20230906050312-e057e77226b0/go.mod h1:3iuqypXhO+GTuy4Bn/53aWFBOglcY+cOzx4UFBDqsTA= -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/caching v0.0.0-20230906132213-a6afde1d97e9 h1:jwVftPnlpNSGHi5MPQaIjkLwhQWEZrm3SqMashXcA9g= +knative.dev/caching v0.0.0-20230906132213-a6afde1d97e9/go.mod h1:cupRWm54x4N6X691zx3SstFaC1R0hs7EzNtsIYiUk5M= +knative.dev/eventing v0.38.1-0.20230906134312-a7b39bc87990 h1:YflLmrwRJPBbN7Ayfw63HC2kmt2wRzYLY0LBsh9OkiA= +knative.dev/eventing v0.38.1-0.20230906134312-a7b39bc87990/go.mod h1:3iuqypXhO+GTuy4Bn/53aWFBOglcY+cOzx4UFBDqsTA= +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-20230830115731-dfd6edf47b91 h1:D3Pca9E6Jk7w2QmDaXeSjSRL2apMMA57Dtjt8efgii8= knative.dev/networking v0.0.0-20230830115731-dfd6edf47b91/go.mod h1:1voQlQD0tuot6U3Kldw+uch33mK2LV85fi3MfbV0CP8= knative.dev/pkg v0.0.0-20230905144417-27252a376b30 h1:q8OCYCux80XnBIscEUTyK9kMAM5cYhPMXlU0b77maz0= knative.dev/pkg v0.0.0-20230905144417-27252a376b30/go.mod h1:KOCW7iby+PL0aSDG2Ta7Vf1kCn+VAqL7QaTyK0c4fuk= -knative.dev/serving v0.38.1-0.20230906063212-815fe70fa08a h1:BTh5ZNWFRO0bq0ANKWc+xPrRwUQpYrJXN24Tb0EeyvI= -knative.dev/serving v0.38.1-0.20230906063212-815fe70fa08a/go.mod h1:n6R3LX2i+sIdOsSYlUN5W9HuSdG/3+QN13VwCSsmPMk= +knative.dev/serving v0.38.1-0.20230906132413-aeb4e94d5752 h1:AoeSPwhpamWSF9hqK+PsmXqCGFpwhNEgOg9juW6qxww= +knative.dev/serving v0.38.1-0.20230906132413-aeb4e94d5752/go.mod h1:n6R3LX2i+sIdOsSYlUN5W9HuSdG/3+QN13VwCSsmPMk= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v1.0.0 h1:iQaM2w5PZ6xvt6x7hbd7tiDS+nk7YPp5uCaEba+T/F4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/knative.dev/hack/hack.go b/vendor/knative.dev/hack/embed.go similarity index 74% rename from vendor/knative.dev/hack/hack.go rename to vendor/knative.dev/hack/embed.go index 25603fc68e..4e39c21a30 100644 --- a/vendor/knative.dev/hack/hack.go +++ b/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 index d9a0de87fd..b6265ad9e2 100644 --- 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 index cd1e58259c..d709822f8c 100644 --- 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 index 4782d09a4c..adc37efe3e 100644 --- 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 index 5eab6a8d24..a5490e0842 100644 --- 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 index 72154d45b3..49f201fcfa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1256,11 +1256,11 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/caching v0.0.0-20230905124918-dfea1937ef85 +# knative.dev/caching v0.0.0-20230906132213-a6afde1d97e9 ## explicit; go 1.18 knative.dev/caching/pkg/apis/caching knative.dev/caching/pkg/apis/caching/v1alpha1 -# knative.dev/eventing v0.38.1-0.20230906050312-e057e77226b0 +# knative.dev/eventing v0.38.1-0.20230906134312-a7b39bc87990 ## explicit; go 1.19 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -1349,7 +1349,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher knative.dev/eventing/test/upgrade/prober/wathola/forwarder knative.dev/eventing/test/upgrade/prober/wathola/receiver knative.dev/eventing/test/upgrade/prober/wathola/sender -# 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/hack/shell @@ -1448,7 +1448,7 @@ knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates knative.dev/pkg/webhook/certificates/resources knative.dev/pkg/webhook/resourcesemantics/conversion -# knative.dev/serving v0.38.1-0.20230906063212-815fe70fa08a +# knative.dev/serving v0.38.1-0.20230906132413-aeb4e94d5752 ## explicit; go 1.18 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1