From 89c74782a6b020f1befaca4c5cfe8dfb3a821a5e Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Thu, 16 Apr 2026 14:11:06 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/hack 54d1312...504af4d: > 504af4d Add env var to pass extra flag to license check, parametrize tool versions (# 470) bumping knative.dev/operator d61290e...9c66d7b: > 9c66d7b upgrade to latest dependencies (# 2275) Signed-off-by: Knative Automation --- go.mod | 4 ++-- go.sum | 12 ++++++------ vendor/knative.dev/hack/library.sh | 20 ++++++++++++++------ vendor/modules.txt | 4 ++-- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index e234190c..12a0cf96 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,8 @@ 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-20260415233235-54d1312ccc91 - knative.dev/operator v0.48.1-0.20260414165234-d61290ed3567 + knative.dev/hack v0.0.0-20260416140237-504af4d2178f + knative.dev/operator v0.48.1-0.20260416043135-9c66d7baea9e knative.dev/pkg v0.0.0-20260416015135-a395c1078b3d ) diff --git a/go.sum b/go.sum index 929cacd5..839a3185 100644 --- a/go.sum +++ b/go.sum @@ -1296,12 +1296,12 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck= 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-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/caching v0.0.0-20260415135440-a753404a9071 h1:LXx4mzoHXGQNEOpnvQeNTj1ovlxH52h0bO+yyYZDfs8= +knative.dev/caching v0.0.0-20260415135440-a753404a9071/go.mod h1:u09EJpGBc+QnYReyYZjolBqz09LvGmx0tx34zc+J2Hk= +knative.dev/hack v0.0.0-20260416140237-504af4d2178f h1:YTht2cGdhd++kSrhwcDutWpk1V1bi0vKpAs0h4xIjpw= +knative.dev/hack v0.0.0-20260416140237-504af4d2178f/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0= +knative.dev/operator v0.48.1-0.20260416043135-9c66d7baea9e h1:fsAnSpd3YmpBiDHMG0FYKHscyAgJuxBbpaqLTRkpJsI= +knative.dev/operator v0.48.1-0.20260416043135-9c66d7baea9e/go.mod h1:FzQp3kbfvafSw4RUREz8y3KWD3x+JNGFCit+wfTc9EA= 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= diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 6eb56679..d5bcacab 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -35,6 +35,13 @@ if [[ ! -v GOPATH ]]; then fi fi +# Pinned tool versions +readonly GUM_VERSION="v0.14.1" +readonly GOTESTSUM_VERSION="v1.13.0" +readonly GOTESTFMT_VERSION="v2.5.0" +readonly TERMINAL_TO_HTML_VERSION="v3.10.0" +readonly GO_LICENSES_VERSION="v2.0.1" + # Useful environment variables [[ -v PROW_JOB_ID ]] && IS_PROW=1 || IS_PROW=0 readonly IS_PROW @@ -265,7 +272,7 @@ function gum_banner() { # Simple info banner for logging purposes. function gum_style() { - go_run github.com/charmbracelet/gum@v0.14.1 style "$@" + go_run "github.com/charmbracelet/gum@${GUM_VERSION}" style "$@" } # Checks whether the given function exists. @@ -588,7 +595,7 @@ function report_go_test() { logfile="${logfile/.xml/.jsonl}" echo "Running go test with args: ${go_test_args[*]}" local gotest_retcode=0 - go_run gotest.tools/gotestsum@v1.13.0 \ + go_run "gotest.tools/gotestsum@${GOTESTSUM_VERSION}" \ --format "${GO_TEST_VERBOSITY:-testname}" \ --junitfile "${xml}" \ --junitfile-testsuite-name relative \ @@ -601,14 +608,14 @@ function report_go_test() { echo "Test log (JSONL) written to ${logfile}" ansilog="${logfile/.jsonl/-ansi.log}" - go_run github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@v2.5.0 \ + go_run "github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@${GOTESTFMT_VERSION}" \ -input "${logfile}" \ -showteststatus \ -nofail > "$ansilog" echo "Test log (ANSI) written to ${ansilog}" htmllog="${logfile/.jsonl/.html}" - go_run github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@v3.10.0 \ + go_run "github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@${TERMINAL_TO_HTML_VERSION}" \ --preview < "$ansilog" > "$htmllog" echo "Test log (HTML) written to ${htmllog}" @@ -921,13 +928,14 @@ function run_kntest() { } # Run go-licenses to check for forbidden licenses. +# Extra flags can be passed via the GO_LICENSES_FLAGS environment variable. function check_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}/..." || \ + go_run "github.com/google/go-licenses/v2@${GO_LICENSES_VERSION}" \ + check ${GO_LICENSES_FLAGS:-} "${REPO_ROOT_DIR}/..." || \ { echo "--- FAIL: go-licenses failed the license check"; return 1; } } diff --git a/vendor/modules.txt b/vendor/modules.txt index aa8a08de..2fb36a18 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -579,10 +579,10 @@ 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-20260415233235-54d1312ccc91 +# knative.dev/hack v0.0.0-20260416140237-504af4d2178f ## explicit; go 1.24 knative.dev/hack -# knative.dev/operator v0.48.1-0.20260414165234-d61290ed3567 +# knative.dev/operator v0.48.1-0.20260416043135-9c66d7baea9e ## explicit; go 1.25.0 knative.dev/operator/pkg/apis/operator knative.dev/operator/pkg/apis/operator/base