From bd3dd7f457262120674f739de993a99636a90d25 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Thu, 7 Sep 2023 01:29:33 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/hack 9cc05a3...760813a: > 760813a Allow to not vendor the dependencies (# 311) > f63d16e :gift: Source embedded hack scripts (# 222) Signed-off-by: Knative Automation --- go.mod | 2 +- go.sum | 4 ++-- 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 | 2 +- 8 files changed, 21 insertions(+), 26 deletions(-) rename vendor/knative.dev/hack/{hack.go => embed.go} (74%) diff --git a/go.mod b/go.mod index 2e146688a..07b1f788a 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ 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/hack v0.0.0-20230818155117-9cc05a31e8c0 + knative.dev/hack v0.0.0-20230906172513-760813ad2706 knative.dev/pkg v0.0.0-20230905144417-27252a376b30 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index bb0e4e952..f47c99279 100644 --- a/go.sum +++ b/go.sum @@ -679,8 +679,8 @@ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+O k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/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/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/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 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 25603fc68..4e39c21a3 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 d9a0de87f..b6265ad9e 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 cd1e58259..d709822f8 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 4782d09a4..adc37efe3 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 5eab6a8d2..a5490e084 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 31a1a5ed7..63d5a25af 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -880,7 +880,7 @@ k8s.io/utils/lru k8s.io/utils/net 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/pkg v0.0.0-20230905144417-27252a376b30