From 48e6acbe9baf0f0fa41fac1daf1ad550a0288771 Mon Sep 17 00:00:00 2001 From: caseydavenport <1944093+caseydavenport@users.noreply.github.com> Date: Thu, 9 Jul 2026 17:14:42 +0000 Subject: [PATCH] Automatic API update from projectcalico/calico release-v3.31 --- deps.txt | 16 +++++++------- go.mod | 64 ++++++++++++++++++++++++++--------------------------- go.sum | 32 +++++++++++++-------------- metadata.mk | 6 ++--- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/deps.txt b/deps.txt index 038c349c6..7fd36f170 100644 --- a/deps.txt +++ b/deps.txt @@ -2,7 +2,7 @@ This file contains the list of modules that this package depends on in order to trigger CI on changes -go 1.25.11 +go 1.25.12 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/emicklei/go-restful/v3 v3.11.0 github.com/fxamacker/cbor/v2 v2.7.0 @@ -25,19 +25,19 @@ github.com/pkg/errors v0.9.1 github.com/projectcalico/calico github.com/spf13/pflag v1.0.7 github.com/x448/float16 v0.8.4 -golang.org/x/net v0.55.0 +golang.org/x/net v0.57.0 golang.org/x/oauth2 v0.36.0 -golang.org/x/sys v0.45.0 -golang.org/x/term v0.43.0 -golang.org/x/text v0.37.0 +golang.org/x/sys v0.47.0 +golang.org/x/term v0.45.0 +golang.org/x/text v0.40.0 golang.org/x/time v0.15.0 google.golang.org/protobuf v1.36.10 gopkg.in/evanphx/json-patch.v4 v4.12.0 gopkg.in/inf.v0 v0.9.1 gopkg.in/yaml.v3 v3.0.1 -k8s.io/api v0.33.12 -k8s.io/apimachinery v0.33.12 -k8s.io/client-go v0.33.12 +k8s.io/api v0.33.13 +k8s.io/apimachinery v0.33.13 +k8s.io/client-go v0.33.13 k8s.io/klog v0.2.0 k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff diff --git a/go.mod b/go.mod index f99360ace..631f18fdc 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ module github.com/projectcalico/api -go 1.25.11 +go 1.25.12 require ( github.com/jinzhu/copier v0.4.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.37.0 - k8s.io/api v0.33.12 - k8s.io/apimachinery v0.33.12 - k8s.io/client-go v0.33.12 + k8s.io/api v0.33.13 + k8s.io/apimachinery v0.33.13 + k8s.io/client-go v0.33.13 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff ) @@ -35,11 +35,11 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/net v0.55.0 // indirect + golang.org/x/net v0.57.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/term v0.43.0 // indirect - golang.org/x/text v0.37.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/term v0.45.0 // indirect + golang.org/x/text v0.40.0 // indirect golang.org/x/time v0.15.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect @@ -55,29 +55,29 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.33.12 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.12 - k8s.io/apimachinery => k8s.io/apimachinery v0.33.12 - k8s.io/apiserver => k8s.io/apiserver v0.33.12 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.12 - k8s.io/client-go => k8s.io/client-go v0.33.12 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.12 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.12 - k8s.io/code-generator => k8s.io/code-generator v0.33.12 - k8s.io/component-base => k8s.io/component-base v0.33.12 - k8s.io/component-helpers => k8s.io/component-helpers v0.33.12 - k8s.io/controller-manager => k8s.io/controller-manager v0.33.12 - k8s.io/cri-api => k8s.io/cri-api v0.33.12 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.12 - k8s.io/externaljwt => k8s.io/externaljwt v0.33.12 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.12 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.12 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.12 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.12 - k8s.io/kubectl => k8s.io/kubectl v0.33.12 - k8s.io/kubelet => k8s.io/kubelet v0.33.12 - k8s.io/metrics => k8s.io/metrics v0.33.12 - k8s.io/mount-utils => k8s.io/mount-utils v0.33.12 + k8s.io/api => k8s.io/api v0.33.13 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.13 + k8s.io/apimachinery => k8s.io/apimachinery v0.33.13 + k8s.io/apiserver => k8s.io/apiserver v0.33.13 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.13 + k8s.io/client-go => k8s.io/client-go v0.33.13 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.13 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.13 + k8s.io/code-generator => k8s.io/code-generator v0.33.13 + k8s.io/component-base => k8s.io/component-base v0.33.13 + k8s.io/component-helpers => k8s.io/component-helpers v0.33.13 + k8s.io/controller-manager => k8s.io/controller-manager v0.33.13 + k8s.io/cri-api => k8s.io/cri-api v0.33.13 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.13 + k8s.io/externaljwt => k8s.io/externaljwt v0.33.13 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.13 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.13 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.13 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.13 + k8s.io/kubectl => k8s.io/kubectl v0.33.13 + k8s.io/kubelet => k8s.io/kubelet v0.33.13 + k8s.io/metrics => k8s.io/metrics v0.33.13 + k8s.io/mount-utils => k8s.io/mount-utils v0.33.13 k8s.io/node-api => k8s.io/node-api v0.33.10 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.12 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.13 ) diff --git a/go.sum b/go.sum index d77cbfeef..5d797b4e2 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -138,14 +138,14 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= -golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0= +golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= 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.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -153,8 +153,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= -golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= +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= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -183,12 +183,12 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.33.12 h1:XxoFmt5RfiBRQM5jNzFwfHCSnJ4CK+fE4xmHvIxvdQw= -k8s.io/api v0.33.12/go.mod h1:U37aPE14I+eOx85zTqiuJUyOBeSYjGXFM8gFxhLKEgU= -k8s.io/apimachinery v0.33.12 h1:60YBbAWDzJYDJpZtiY4w0WgQyHoG9MZk/QyOknOjm20= -k8s.io/apimachinery v0.33.12/go.mod h1:a8VYBaEU2Z6n2IxTG2Hs6WX5i0wQFPGyl4YFab4kn90= -k8s.io/client-go v0.33.12 h1:c6bUsOCwRl1bwTFNuNfZkR1y1HXsFxI0poCEzMYDKjU= -k8s.io/client-go v0.33.12/go.mod h1:Ct4pzYnHMA0XeWUnSSqAp5xPKUanzTGA80Mr3OZN9OY= +k8s.io/api v0.33.13 h1:Au/I/J8SXmcCBxp+KiS82451AEaKjVHouB1x3lUm1Wk= +k8s.io/api v0.33.13/go.mod h1:XCIdoR5NWEBB8xORizkh3zBSUk4Pz5KnfnGuOesy0+k= +k8s.io/apimachinery v0.33.13 h1:e15J9pNLORqlAQ3/D2QdXvMTHJLl0PxDhike6iNcw20= +k8s.io/apimachinery v0.33.13/go.mod h1:a8VYBaEU2Z6n2IxTG2Hs6WX5i0wQFPGyl4YFab4kn90= +k8s.io/client-go v0.33.13 h1:gyirIFpLEF9RltmrUkkObQFkxeumU2hRcxiDsVfrf1w= +k8s.io/client-go v0.33.13/go.mod h1:JcZUgHTHDjbLaFaGVNuGmef4iqKNqOzdtwDu3RlR058= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4= diff --git a/metadata.mk b/metadata.mk index 035e93f41..55cbbd9d9 100644 --- a/metadata.mk +++ b/metadata.mk @@ -3,14 +3,14 @@ ################################################################################################# # 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.33.12 +K8S_VERSION=v1.33.13 # The version of LLVM to use for go-build and calico/base images. 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%=%) -CALICO_BASE_VER=ubi9-1780507355 +CALICO_BASE_VER=ubi9-1783525764 # Env var to ACK Ginkgo deprecation warnings, may need updating with go-build. ACK_GINKGO=ACK_GINKGO_DEPRECATIONS=1.16.5