diff --git a/go.mod b/go.mod index cb3a75762..fed600ab3 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.23.0 toolchain go1.24.1 -// When using v0.31.6, need to use this version of structured-merge-diff. -// See https://github.com/kubernetes/apimachinery/blob/v0.31.6/go.mod#L30 +// When using v0.31.7, need to use this version of structured-merge-diff. +// See https://github.com/kubernetes/apimachinery/blob/v0.31.7/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 @@ -51,15 +51,15 @@ require ( golang.org/x/sync v0.12.0 golang.org/x/term v0.30.0 golang.org/x/text v0.23.0 - 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/api v0.31.7 + k8s.io/apiextensions-apiserver v0.31.7 + k8s.io/apimachinery v0.31.7 + k8s.io/apiserver v0.31.7 + k8s.io/client-go v0.31.7 + k8s.io/component-base v0.31.7 k8s.io/gengo v0.0.0-20250207200755-1244d31929d7 k8s.io/klog/v2 v2.130.1 - k8s.io/kube-aggregator v0.31.5 + k8s.io/kube-aggregator v0.31.7 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e sigs.k8s.io/yaml v1.4.0 diff --git a/go.sum b/go.sum index e1436de58..916196783 100644 --- a/go.sum +++ b/go.sum @@ -1095,18 +1095,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.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/api v0.31.7 h1:wSo59nXpVXmaB6hgNVJCrdnKtyYoutIgpNNBbROBd2U= +k8s.io/api v0.31.7/go.mod h1:vLUha4nXRUGtQdayzsmjur0lQApK/sJSxyR/fwuujcU= +k8s.io/apiextensions-apiserver v0.31.7 h1:FujQQl6iKuCF5nX4GIQy3ClvftU8MqadAyi9oQ6ZeAw= +k8s.io/apiextensions-apiserver v0.31.7/go.mod h1:YmNzYECWFYy8n9R0oxtVAD9JYILZnZCNziYrpUQhKeI= +k8s.io/apimachinery v0.31.7 h1:fpV8yLerIZFAkj0of66+i1ArPv/Btf9KO6Aulng7RRw= +k8s.io/apimachinery v0.31.7/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apiserver v0.31.7 h1:L1JQgfdQfvSZNBhXJljv9ekc/JirAZAmR3B2Np5mSKk= +k8s.io/apiserver v0.31.7/go.mod h1:IAHYtQWod93amFVHuFlPJAZkYF+aC5qblgDNsSvP9mQ= +k8s.io/client-go v0.31.7 h1:2+LFJc6Xw6rhmpDbN1NSmhoFLWBh62cPG/P+IfaTSGY= +k8s.io/client-go v0.31.7/go.mod h1:hrrMorBQ17LqzoKIxKg5cSWvmWl94EwA/MUF0Mkf+Zw= +k8s.io/component-base v0.31.7 h1:HLGy3757F1xfidwYzrsrL6gqAML4jKiT1rfNTRv1vhw= +k8s.io/component-base v0.31.7/go.mod h1:OzaImRFsLuWLA/KyahAjR/pmG0dhxciGB9Rb1vTgdJ0= k8s.io/gengo v0.0.0-20250207200755-1244d31929d7 h1:iOdAjO5OsCszwPG5xNcJJL+rKaMUogk5fx9HsYZJxQM= k8s.io/gengo v0.0.0-20250207200755-1244d31929d7/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= @@ -1114,8 +1114,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.5 h1:ibCqykJwv7Ht4tgwd1793N6h444gf5m7ZH2dpJ0r4yI= -k8s.io/kube-aggregator v0.31.5/go.mod h1:bWajrGqcljoq5w1zWwj1qU34VoKfZeMZSCbK/vp127s= +k8s.io/kube-aggregator v0.31.7 h1:pRiMQ2M1dAGJqwXPeldwd4zes5SlMGQ6TF6y45lROco= +k8s.io/kube-aggregator v0.31.7/go.mod h1:H8FjeBnKLiWksKEfaQ3AiVzbLmkRPApL5TWaZtcEppU= 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-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro= diff --git a/hack/update-go-mod/overrides.conf b/hack/update-go-mod/overrides.conf index 914672f73..792c3e976 100644 --- a/hack/update-go-mod/overrides.conf +++ b/hack/update-go-mod/overrides.conf @@ -8,15 +8,15 @@ 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.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/api k8s.io/api@v0.31.7 +k8s.io/apiextensions-apiserver k8s.io/apiextensions-apiserver@v0.31.7 +k8s.io/apimachinery k8s.io/apimachinery@v0.31.7 +k8s.io/apiserver k8s.io/apiserver@v0.31.7 +k8s.io/client-go k8s.io/client-go@v0.31.7 +k8s.io/component-base k8s.io/component-base@v0.31.7 +k8s.io/kube-aggregator k8s.io/kube-aggregator@v0.31.7 +# When using v0.31.7, need to use this version of kube-openapi. +# See https://github.com/kubernetes/apiserver/blob/v0.31.7/go.mod#L54 k8s.io/kube-openapi k8s.io/kube-openapi@v0.0.0-20240228011516-70dd3763d340 # We would like to use the version of cdproto that is selected by our current