Skip to content

Commit 5e88665

Browse files
upgrade to latest dependencies (#2810)
bumping knative.dev/hack 9cc05a3...0bb79ff: > 0bb79ff Update community files (# 314) > 3af329f Update community files (# 313) > 760813a Allow to not vendor the dependencies (# 311) > f63d16e 🎁 Source embedded hack scripts (# 222) Signed-off-by: Knative Automation <[email protected]>
1 parent 96dc59b commit 5e88665

File tree

8 files changed

+21
-26
lines changed

8 files changed

+21
-26
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9
4949
k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54
5050
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
51-
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0
51+
knative.dev/hack v0.0.0-20230914013105-0bb79ff2d162
5252
sigs.k8s.io/yaml v1.3.0
5353
)
5454

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -757,8 +757,8 @@ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+O
757757
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
758758
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8=
759759
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
760-
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0 h1:n9YEGYuoj31pAkhGlNL+xTQAeXKYTLeMmIZLWA9fAeo=
761-
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
760+
knative.dev/hack v0.0.0-20230914013105-0bb79ff2d162 h1:5IYUAmyfUsvSoP5ZQmqBetYLMv/EUEayC4uHEuhTnCo=
761+
knative.dev/hack v0.0.0-20230914013105-0bb79ff2d162/go.mod h1:dx0YG3YWqJu653e9tjcT0Q1ZdS9JJXLKbUhzr4EB0g8=
762762
pgregory.net/rapid v1.0.0 h1:iQaM2w5PZ6xvt6x7hbd7tiDS+nk7YPp5uCaEba+T/F4=
763763
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
764764
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
//go:build hack
2-
// +build hack
3-
41
/*
5-
Copyright 2020 The Knative Authors
2+
Copyright 2022 The Knative Authors
63
74
Licensed under the Apache License, Version 2.0 (the "License");
85
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
1714
limitations under the License.
1815
*/
1916

20-
// package hack is a collection of scripts used to bootstrap CI processes and
21-
// other vital entrypoint functionality.
22-
2317
package hack
18+
19+
import "embed"
20+
21+
//go:embed *.sh
22+
var Scripts embed.FS

vendor/knative.dev/hack/go.work

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ use (
44
.
55
schema
66
test
7+
test/vendorproj
78
)

vendor/knative.dev/hack/go.work.sum

-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
1-
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
2-
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
3-
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
4-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
5-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
6-
k8s.io/apimachinery v0.20.6 h1:R5p3SlhaABYShQSO6LpPsYHjV05Q+79eBUR0Ut/f4tk=
7-
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
8-
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
9-
sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU=
10-
sigs.k8s.io/structured-merge-diff/v4 v4.0.3 h1:4oyYo8NREp49LBBhKxEqCulFjg26rawYKrnCmg+Sr6c=
111
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
122
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=

vendor/knative.dev/hack/infra-library.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ function create_gke_test_cluster() {
157157
--v=1 \
158158
--network=e2e-network \
159159
--boskos-acquire-timeout-seconds=1200 \
160-
--region="${E2E_CLUSTER_REGION},us-east1,us-west1" \
160+
--region="${E2E_CLUSTER_REGION:-us-central1},us-east1,us-west1" \
161161
--gcloud-extra-flags="${_extra_gcloud_flags[*]}" \
162162
--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.*' \
163163
--test=exec \

vendor/knative.dev/hack/library.sh

+9-4
Original file line numberDiff line numberDiff line change
@@ -718,18 +718,23 @@ function __go_update_deps_for_module() {
718718
fi
719719
fi
720720

721-
group "Go mod tidy and vendor"
721+
group "Go mod tidy"
722722

723723
# Prune modules.
724-
local orig_pipefail_opt=$(shopt -p -o pipefail)
724+
local orig_pipefail_opt
725+
orig_pipefail_opt=$(shopt -p -o pipefail)
725726
set -o pipefail
726727
go mod tidy 2>&1 | grep -v "ignoring symlink" || true
727-
go mod vendor 2>&1 | grep -v "ignoring symlink" || true
728+
if [[ "${FORCE_VENDOR:-false}" == "true" ]] || [ -d vendor ]; then
729+
group "Go mod vendor"
730+
go mod vendor 2>&1 | grep -v "ignoring symlink" || true
731+
fi
728732
eval "$orig_pipefail_opt"
729733

730-
if ! [ -d vendor ]; then
734+
if ! [[ "${FORCE_VENDOR:-false}" == "true" ]] && ! [ -d vendor ]; then
731735
return 0
732736
fi
737+
733738
group "Removing unwanted vendor files"
734739

735740
# Remove unwanted vendor files

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ k8s.io/utils/net
10721072
k8s.io/utils/pointer
10731073
k8s.io/utils/strings/slices
10741074
k8s.io/utils/trace
1075-
# knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0
1075+
# knative.dev/hack v0.0.0-20230914013105-0bb79ff2d162
10761076
## explicit; go 1.18
10771077
knative.dev/hack
10781078
# sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2

0 commit comments

Comments
 (0)