From f5b3e6da934b95441556744acb5980b4a4e68dfd Mon Sep 17 00:00:00 2001 From: Joshua Casey Date: Mon, 3 Feb 2025 09:37:21 -0600 Subject: [PATCH] Bump to k8s.io@v0.31.5 libs --- go.mod | 19 ++++++++++--------- go.sum | 28 ++++++++++++++-------------- hack/update-go-mod/overrides.conf | 18 +++++++++--------- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index 88307bb90..615b13bd5 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,9 @@ go 1.23.0 toolchain go1.23.5 -// When using v0.31.4, need to use this version of structured-merge-diff. -// See https://github.com/kubernetes/apimachinery/blob/v0.31.4/go.mod#L30 +// When using v0.31.5, need to use this version of structured-merge-diff. +// See https://github.com/kubernetes/apimachinery/blob/v0.31.5/go.mod#L30 +// This replace must be in the go.mod, not overrides.conf, because it is an "indirect" dependency. replace sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1 require ( @@ -50,15 +51,15 @@ require ( golang.org/x/sync v0.10.0 golang.org/x/term v0.28.0 golang.org/x/text v0.21.0 - k8s.io/api v0.31.4 - k8s.io/apiextensions-apiserver v0.31.4 - k8s.io/apimachinery v0.31.4 - k8s.io/apiserver v0.31.4 - k8s.io/client-go v0.31.4 - k8s.io/component-base v0.31.4 + k8s.io/api v0.31.5 + k8s.io/apiextensions-apiserver v0.31.5 + k8s.io/apimachinery v0.31.5 + k8s.io/apiserver v0.31.5 + k8s.io/client-go v0.31.5 + k8s.io/component-base v0.31.5 k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 k8s.io/klog/v2 v2.130.1 - k8s.io/kube-aggregator v0.31.4 + k8s.io/kube-aggregator v0.31.5 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 k8s.io/utils v0.0.0-20241210054802-24370beab758 sigs.k8s.io/yaml v1.4.0 diff --git a/go.sum b/go.sum index 4b83e5c59..982e54983 100644 --- a/go.sum +++ b/go.sum @@ -1091,18 +1091,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.31.4 h1:I2QNzitPVsPeLQvexMEsj945QumYraqv9m74isPDKhM= -k8s.io/api v0.31.4/go.mod h1:d+7vgXLvmcdT1BCo79VEgJxHHryww3V5np2OYTr6jdw= -k8s.io/apiextensions-apiserver v0.31.4 h1:FxbqzSvy92Ca9DIs5jqot883G0Ln/PGXfm/07t39LS0= -k8s.io/apiextensions-apiserver v0.31.4/go.mod h1:hIW9YU8UsqZqIWGG99/gsdIU0Ar45Qd3A12QOe/rvpg= -k8s.io/apimachinery v0.31.4 h1:8xjE2C4CzhYVm9DGf60yohpNUh5AEBnPxCryPBECmlM= -k8s.io/apimachinery v0.31.4/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/apiserver v0.31.4 h1:JbtnTaXVYEAYIHJil6Wd74Wif9sd8jVcBw84kwEmp7o= -k8s.io/apiserver v0.31.4/go.mod h1:JJjoTjZ9PTMLdIFq7mmcJy2B9xLN3HeAUebW6xZyIP0= -k8s.io/client-go v0.31.4 h1:t4QEXt4jgHIkKKlx06+W3+1JOwAFU/2OPiOo7H92eRQ= -k8s.io/client-go v0.31.4/go.mod h1:kvuMro4sFYIa8sulL5Gi5GFqUPvfH2O/dXuKstbaaeg= -k8s.io/component-base v0.31.4 h1:wCquJh4ul9O8nNBSB8N/o8+gbfu3BVQkVw9jAUY/Qtw= -k8s.io/component-base v0.31.4/go.mod h1:G4dgtf5BccwiDT9DdejK0qM6zTK0jwDGEKnCmb9+u/s= +k8s.io/api v0.31.5 h1:7jP74egbPUOCLJV5KheUnwo9gz3zzUsMIj2EPkuYK1E= +k8s.io/api v0.31.5/go.mod h1:RMyMdZG1kJjou2ng5buEti0OHlo0uFXgSzTZ/k5LeVk= +k8s.io/apiextensions-apiserver v0.31.5 h1:50+b/hHx4nyvQ+gaFH7p5myPEZyekGhGGAQb4vnBUlQ= +k8s.io/apiextensions-apiserver v0.31.5/go.mod h1:6vZ7IIlk3l7GSFcbaNz5CEYpUBLsQ0ee+LgLGOsExWQ= +k8s.io/apimachinery v0.31.5 h1:NxhAVGcfrSdTMx3M2v1OnvcMS7h1ZnWyt2x2z8CJJBU= +k8s.io/apimachinery v0.31.5/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apiserver v0.31.5 h1:n0daI1zIb+G2Jkzqjm2NQJSJfTKccgFeHHQM4LYsz7E= +k8s.io/apiserver v0.31.5/go.mod h1:SboTZ2NHCsXjAHqTrE/kDTnrzquVY5mDKNnoCdRFLJw= +k8s.io/client-go v0.31.5 h1:rmDswcUaIFAJ5vJaB82pjyqc52DgHCPv0G6af3OupO0= +k8s.io/client-go v0.31.5/go.mod h1:js93IlRSzRHql9o9zP54N56rMR249uH4+srnSOcFLsU= +k8s.io/component-base v0.31.5 h1:kpFiy1hI7F4Owp+o59H2CVLzmN94qwcPz+2L6wRhkqM= +k8s.io/component-base v0.31.5/go.mod h1:OiiusrmcLz42i9VvcAd94yQIN7UzQHJxN/hXxwYzj6E= k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 h1:4eL6zr5VCj71nu2nOuQ6j6m/kqh5WueXBN8daZkNe90= k8s.io/gengo v0.0.0-20250130153323-76c5745d3511/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= @@ -1110,8 +1110,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kms v0.32.0 h1:jwOfunHIrcdYl5FRcA+uUKKtg6qiqoPCwmS2T3XTYL4= k8s.io/kms v0.32.0/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= -k8s.io/kube-aggregator v0.31.4 h1:4hWVeNo4vLWstckMCo223cb9j7cCt7KD6b+RhQ8hTNE= -k8s.io/kube-aggregator v0.31.4/go.mod h1:R1wXjopE/VgW947R1axTzwEmyuatUp/a2lKn/ZGo2yo= +k8s.io/kube-aggregator v0.31.5 h1:ibCqykJwv7Ht4tgwd1793N6h444gf5m7ZH2dpJ0r4yI= +k8s.io/kube-aggregator v0.31.5/go.mod h1:bWajrGqcljoq5w1zWwj1qU34VoKfZeMZSCbK/vp127s= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= diff --git a/hack/update-go-mod/overrides.conf b/hack/update-go-mod/overrides.conf index 87e81efdb..806fa4a59 100644 --- a/hack/update-go-mod/overrides.conf +++ b/hack/update-go-mod/overrides.conf @@ -8,13 +8,13 @@ github.com/ory/fosite github.com/ory/fosite@master # causes the race detector to fail our unit tests. We hope to remove these # version locks as soon as possible. # See https://github.com/vmware-tanzu/pinniped/issues/2157. -k8s.io/api k8s.io/api@v0.31.4 -k8s.io/apiextensions-apiserver k8s.io/apiextensions-apiserver@v0.31.4 -k8s.io/apimachinery k8s.io/apimachinery@v0.31.4 -k8s.io/apiserver k8s.io/apiserver@v0.31.4 -k8s.io/client-go k8s.io/client-go@v0.31.4 -k8s.io/component-base k8s.io/component-base@v0.31.4 -k8s.io/kube-aggregator k8s.io/kube-aggregator@v0.31.4 -# When using v0.31.4, need to use this version of kube-openapi. -# See https://github.com/kubernetes/apiserver/blob/v0.31.4/go.mod#L54 +k8s.io/api k8s.io/api@v0.31.5 +k8s.io/apiextensions-apiserver k8s.io/apiextensions-apiserver@v0.31.5 +k8s.io/apimachinery k8s.io/apimachinery@v0.31.5 +k8s.io/apiserver k8s.io/apiserver@v0.31.5 +k8s.io/client-go k8s.io/client-go@v0.31.5 +k8s.io/component-base k8s.io/component-base@v0.31.5 +k8s.io/kube-aggregator k8s.io/kube-aggregator@v0.31.5 +# When using v0.31.5, need to use this version of kube-openapi. +# See https://github.com/kubernetes/apiserver/blob/v0.31.5/go.mod#L54 k8s.io/kube-openapi k8s.io/kube-openapi@v0.0.0-20240228011516-70dd3763d340