Skip to content

Commit a291034

Browse files
upgrade to latest dependencies (#6618)
bumping knative.dev/hack 9909d69...54d1312: > 54d1312 fix check_licenses GOTOOLCHAIN mismatch with go-licenses (# 464) > 748c85e Fix create kind test cluster args (# 466) Signed-off-by: Knative Automation <automation@knative.team>
1 parent 30de93b commit a291034

6 files changed

Lines changed: 19 additions & 11 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.0
55
require (
66
github.com/google/go-github/v32 v32.1.0
77
gopkg.in/yaml.v2 v2.3.0
8-
knative.dev/hack v0.0.0-20260415132636-9909d690ab4d
8+
knative.dev/hack v0.0.0-20260415233235-54d1312ccc91
99
)
1010

1111
require (

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8X
2323
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2424
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
2525
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
26-
knative.dev/hack v0.0.0-20260415132636-9909d690ab4d h1:ckrA4ssLeQF0dKfvL8Do9IKR+5tHE9Oiy1eNx+3YNz8=
27-
knative.dev/hack v0.0.0-20260415132636-9909d690ab4d/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=
26+
knative.dev/hack v0.0.0-20260415233235-54d1312ccc91 h1:YkboMEJ48h7DxRQSPe2SePm1yKK0YYgrsQW5Mmc0SEk=
27+
knative.dev/hack v0.0.0-20260415233235-54d1312ccc91/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=

vendor/knative.dev/hack/e2e-tests.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,14 @@ function setup_test_cluster() {
5454
header "Setting up test cluster"
5555
kubectl get nodes
5656

57-
# Set the actual project the test cluster resides in
58-
# It will be a project assigned by Boskos if test is running on Prow,
59-
# otherwise will be ${E2E_GCP_PROJECT_ID} set up by user.
60-
E2E_PROJECT_ID="$(gcloud config get-value project)"
57+
# Set the actual project the test cluster resides in. For GKE this
58+
# comes from the Boskos-configured gcloud context; for other
59+
# providers (e.g. kind) it is not meaningful and is left empty.
60+
if [[ "${CLOUD_PROVIDER}" == "gke" ]]; then
61+
E2E_PROJECT_ID="$(gcloud config get-value project)"
62+
else
63+
E2E_PROJECT_ID=""
64+
fi
6165
export E2E_PROJECT_ID
6266
readonly E2E_PROJECT_ID
6367

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ function dump_cluster_state() {
8484
# Create a test cluster and run the tests if provided.
8585
# Parameters: $1 - cluster provider name, e.g. gke
8686
# $2 - custom flags supported by kntest
87-
# $3 - test command to run after cluster is created
87+
# $3 - extra gcloud flags (gke only)
88+
# $4 - test command to run after cluster is created
8889
function create_test_cluster() {
8990
# Fail fast during setup.
9091
set -o errexit
@@ -96,7 +97,7 @@ function create_test_cluster() {
9697

9798
case "$1" in
9899
gke) create_gke_test_cluster "$2" "$3" "$4" "${5:-}" ;;
99-
kind) create_kind_test_cluster "$2" "$3" "${4:-}" ;;
100+
kind) create_kind_test_cluster "$2" "${4:-}" ;;
100101
*) echo "unsupported provider: $1"; exit 1 ;;
101102
esac
102103

vendor/knative.dev/hack/library.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,10 @@ function run_kntest() {
922922

923923
# Run go-licenses to check for forbidden licenses.
924924
function check_licenses() {
925-
# Check that we don't have any forbidden licenses.
925+
# Pin GOTOOLCHAIN to the project's Go version so that go-licenses is
926+
# compiled with the same toolchain. GOTOOLCHAIN=auto (the go_run default)
927+
# may select a different Go, causing isStdLib() path mismatches.
928+
GOTOOLCHAIN="$(go env GOVERSION)" \
926929
go_run github.com/google/go-licenses/v2@v2.0.1 \
927930
check "${REPO_ROOT_DIR}/..." || \
928931
{ echo "--- FAIL: go-licenses failed the license check"; return 1; }

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ golang.org/x/crypto/openpgp/s2k
2222
# gopkg.in/yaml.v2 v2.3.0
2323
## explicit
2424
gopkg.in/yaml.v2
25-
# knative.dev/hack v0.0.0-20260415132636-9909d690ab4d
25+
# knative.dev/hack v0.0.0-20260415233235-54d1312ccc91
2626
## explicit; go 1.24
2727
knative.dev/hack
2828
# go.opencensus.io => go.opencensus.io v0.20.2

0 commit comments

Comments
 (0)