diff --git a/go.mod b/go.mod index bee62ede..e234190c 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( k8s.io/api v0.35.3 k8s.io/apimachinery v0.35.3 k8s.io/client-go v0.35.3 - knative.dev/hack v0.0.0-20260415132636-9909d690ab4d + knative.dev/hack v0.0.0-20260415233235-54d1312ccc91 knative.dev/operator v0.48.1-0.20260414165234-d61290ed3567 - knative.dev/pkg v0.0.0-20260415140041-388556d5c488 + knative.dev/pkg v0.0.0-20260416015135-a395c1078b3d ) require ( diff --git a/go.sum b/go.sum index 4997c440..929cacd5 100644 --- a/go.sum +++ b/go.sum @@ -1298,12 +1298,12 @@ k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzk k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/caching v0.0.0-20260414015133-3b3e0f9bf7df h1:tplvZMWlb7kaOAOIkrtsi5VrVF3D3vt56o4UXpMUwXY= knative.dev/caching v0.0.0-20260414015133-3b3e0f9bf7df/go.mod h1:nKU1T8kNtzHdkY1jIML86a5DfePto/m5XnyELYG9pp0= -knative.dev/hack v0.0.0-20260415132636-9909d690ab4d h1:ckrA4ssLeQF0dKfvL8Do9IKR+5tHE9Oiy1eNx+3YNz8= -knative.dev/hack v0.0.0-20260415132636-9909d690ab4d/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0= +knative.dev/hack v0.0.0-20260415233235-54d1312ccc91 h1:YkboMEJ48h7DxRQSPe2SePm1yKK0YYgrsQW5Mmc0SEk= +knative.dev/hack v0.0.0-20260415233235-54d1312ccc91/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0= knative.dev/operator v0.48.1-0.20260414165234-d61290ed3567 h1:5XU06/WOqTkkohcCNMB3AnNSSP0S2DgORsfGelnYVr8= knative.dev/operator v0.48.1-0.20260414165234-d61290ed3567/go.mod h1:5UlAo7hyYeFe7mHhW+YeyY6Jsqbz4VqLn5VzHtyVNH0= -knative.dev/pkg v0.0.0-20260415140041-388556d5c488 h1:7rmo6AW+6NLaWI+qTWv0ABlXz1bpdpaNnnpSBiuQ3vs= -knative.dev/pkg v0.0.0-20260415140041-388556d5c488/go.mod h1:LaL/m4gFNTSUOP0DvHNCVcruVTi5Dyzts5/6UlPuTEQ= +knative.dev/pkg v0.0.0-20260416015135-a395c1078b3d h1:u9tHGBMUh1CYgZOdIBxeXpjvEPNIXT/rCjWVFUtzzs8= +knative.dev/pkg v0.0.0-20260416015135-a395c1078b3d/go.mod h1:SvS4U6mNzjdSvasGVgnuox9eKsG9INWroDcpBo0wFnE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/hack/e2e-tests.sh b/vendor/knative.dev/hack/e2e-tests.sh index 331511cc..426c1cd9 100644 --- a/vendor/knative.dev/hack/e2e-tests.sh +++ b/vendor/knative.dev/hack/e2e-tests.sh @@ -54,10 +54,14 @@ function setup_test_cluster() { header "Setting up test cluster" kubectl get nodes - # Set the actual project the test cluster resides in - # It will be a project assigned by Boskos if test is running on Prow, - # otherwise will be ${E2E_GCP_PROJECT_ID} set up by user. - E2E_PROJECT_ID="$(gcloud config get-value project)" + # Set the actual project the test cluster resides in. For GKE this + # comes from the Boskos-configured gcloud context; for other + # providers (e.g. kind) it is not meaningful and is left empty. + if [[ "${CLOUD_PROVIDER}" == "gke" ]]; then + E2E_PROJECT_ID="$(gcloud config get-value project)" + else + E2E_PROJECT_ID="" + fi export E2E_PROJECT_ID readonly E2E_PROJECT_ID diff --git a/vendor/knative.dev/hack/infra-library.sh b/vendor/knative.dev/hack/infra-library.sh index e74b839e..db364ed8 100644 --- a/vendor/knative.dev/hack/infra-library.sh +++ b/vendor/knative.dev/hack/infra-library.sh @@ -84,7 +84,8 @@ function dump_cluster_state() { # Create a test cluster and run the tests if provided. # Parameters: $1 - cluster provider name, e.g. gke # $2 - custom flags supported by kntest -# $3 - test command to run after cluster is created +# $3 - extra gcloud flags (gke only) +# $4 - test command to run after cluster is created function create_test_cluster() { # Fail fast during setup. set -o errexit @@ -96,7 +97,7 @@ function create_test_cluster() { case "$1" in gke) create_gke_test_cluster "$2" "$3" "$4" "${5:-}" ;; - kind) create_kind_test_cluster "$2" "$3" "${4:-}" ;; + kind) create_kind_test_cluster "$2" "${4:-}" ;; *) echo "unsupported provider: $1"; exit 1 ;; esac diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 2dbe5a7a..6eb56679 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -922,7 +922,10 @@ function run_kntest() { # Run go-licenses to check for forbidden licenses. function check_licenses() { - # Check that we don't have any forbidden licenses. + # Pin GOTOOLCHAIN to the project's Go version so that go-licenses is + # compiled with the same toolchain. GOTOOLCHAIN=auto (the go_run default) + # may select a different Go, causing isStdLib() path mismatches. + GOTOOLCHAIN="$(go env GOVERSION)" \ go_run github.com/google/go-licenses/v2@v2.0.1 \ check "${REPO_ROOT_DIR}/..." || \ { echo "--- FAIL: go-licenses failed the license check"; return 1; } diff --git a/vendor/modules.txt b/vendor/modules.txt index ea138811..aa8a08de 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -579,7 +579,7 @@ k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/ptr k8s.io/utils/trace -# knative.dev/hack v0.0.0-20260415132636-9909d690ab4d +# knative.dev/hack v0.0.0-20260415233235-54d1312ccc91 ## explicit; go 1.24 knative.dev/hack # knative.dev/operator v0.48.1-0.20260414165234-d61290ed3567 @@ -592,7 +592,7 @@ knative.dev/operator/pkg/client/clientset/versioned/scheme knative.dev/operator/pkg/client/clientset/versioned/typed/operator/v1beta1 knative.dev/operator/test knative.dev/operator/test/client -# knative.dev/pkg v0.0.0-20260415140041-388556d5c488 +# knative.dev/pkg v0.0.0-20260416015135-a395c1078b3d ## explicit; go 1.25.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck