diff --git a/deps.txt b/deps.txt index 96fc37d75..d568ba585 100644 --- a/deps.txt +++ b/deps.txt @@ -1,7 +1,7 @@ !!! GENERATED FILE, DO NOT EDIT !!! Run 'make gen-deps-files' to regenerate. -go 1.25.11 +go 1.25.12 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/emicklei/go-restful v2.15.0+incompatible github.com/emicklei/go-restful/v3 v3.12.2 @@ -29,7 +29,7 @@ golang.org/x/net v0.56.0 golang.org/x/oauth2 v0.36.0 golang.org/x/sys v0.46.0 golang.org/x/term v0.44.0 -golang.org/x/text v0.38.0 +golang.org/x/text v0.39.0 golang.org/x/time v0.15.0 google.golang.org/protobuf v1.36.10 gopkg.in/evanphx/json-patch.v4 v4.13.0 diff --git a/go.mod b/go.mod index d3a8683f8..e209051ce 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/projectcalico/api -go 1.25.11 +go 1.25.12 require ( github.com/jinzhu/copier v0.4.0 @@ -46,9 +46,9 @@ require ( golang.org/x/sync v0.21.0 // indirect golang.org/x/sys v0.46.0 // indirect golang.org/x/term v0.44.0 // indirect - golang.org/x/text v0.38.0 // indirect + golang.org/x/text v0.39.0 // indirect golang.org/x/time v0.15.0 // indirect - golang.org/x/tools v0.46.0 // indirect + golang.org/x/tools v0.47.0 // indirect google.golang.org/protobuf v1.36.8 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 2a7b6abe1..d0bee9e70 100644 --- a/go.sum +++ b/go.sum @@ -116,12 +116,12 @@ golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw= golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc= golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y= -golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE= -golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4= +golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus= +golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM= golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= -golang.org/x/tools v0.46.0 h1:7jTurBkPZu4moS/Uy4OQT1M+QBlsj3wejyZwsT8Z7rk= -golang.org/x/tools v0.46.0/go.mod h1:FrD85F8l+NWL+9XWBSyVSHO6Ne4jutsfIFba7AWQ5Ys= +golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= +golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/metadata.mk b/metadata.mk index 786b6dcc3..042da0063 100644 --- a/metadata.mk +++ b/metadata.mk @@ -2,7 +2,7 @@ # This file contains Makefile configuration parameters and metadata for this branch. ################################################################################################# # The project Go version -GO_VERSION=1.25.11 +GO_VERSION=1.25.12 # Version of Kubernetes to use for dependencies, tests, registry.k8s.io/kubectl, and kubectl binary release. K8S_VERSION=v1.35.6 # The version of LLVM to use for go-build and calico/base images. @@ -10,7 +10,7 @@ LLVM_VERSION=18.1.8 # The version of calico/go-build and calico/base to use. GO_BUILD_VER=$(GO_VERSION)-llvm$(LLVM_VERSION)-k8s$(K8S_VERSION:v%=%) RUST_BUILD_VER=1.93.1 -CALICO_BASE_VER=ubi9-1781722225 +CALICO_BASE_VER=ubi9-1783525764 # Version of various tools used in the build and tests. COREDNS_VERSION=1.5.2