Merge remote-tracking branch 'origin/master' into release-1.31

Kubernetes-commit: 57846e1f1f1618b1c0c8e49667c3633762d866ac

go.mod

@@ -29,12 +29,12 @@ require (
  golang.org/x/sys v0.21.0
  gopkg.in/evanphx/json-patch.v4 v4.12.0
  gopkg.in/yaml.v2 v2.4.0
- k8s.io/api v0.0.0-20240724010313-f04ea0bc861d
+ k8s.io/api v0.0.0-20240801003428-382a0912e579
  k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe
- k8s.io/cli-runtime v0.0.0-20240722232727-5f321dd941eb
- k8s.io/client-go v0.0.0-20240724010704-ac9204c6195b
- k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440
- k8s.io/component-helpers v0.0.0-20240723204758-b05521a7bd36
+ k8s.io/cli-runtime v0.0.0-20240801013340-86e7f902dfd7
+ k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9
+ k8s.io/component-base v0.0.0-20240801005513-6332889bcf10
+ k8s.io/component-helpers v0.0.0-20240801005738-7473aa8e4624
  k8s.io/klog/v2 v2.130.1
  k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
  k8s.io/metrics v0.0.0-20240801013046-d3a51c3340fa
@@ -96,6 +96,6 @@ require (
  sigs.k8s.io/kustomize/api v0.17.2 // indirect
 )
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20240720023521-ec3cc888df4c
+replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20240801005206-f74ea3c4283b
 
 replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe

go.sum

@@ -277,18 +277,18 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.0.0-20240724010313-f04ea0bc861d h1:phdCFnuErJqqxJwiX9uNdygnJ1i3RiTQepKHtf354qA=
-k8s.io/api v0.0.0-20240724010313-f04ea0bc861d/go.mod h1:ytlEzqC2wOTwYET71W7+J+k7O2V7vrDuzmNLBSpgT+k=
+k8s.io/api v0.0.0-20240801003428-382a0912e579 h1:pElFtnw6/eJb1SLes+tbAqfL/7IezesSZ1bLTO+b2UE=
+k8s.io/api v0.0.0-20240801003428-382a0912e579/go.mod h1:sSxNOmsgxkyv9k7Nu9ysVYNCkTkTemOgz4HxbATSKDQ=
 k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe h1:lt6b7CTEYMgUTCGIZrATyWMZTQThE+qIQq5YTCbpMVQ=
 k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/cli-runtime v0.0.0-20240722232727-5f321dd941eb h1:yv9ReRIg3QrBPy2Yo50L3bvWbACXByOxmq9iwB4FoC0=
-k8s.io/cli-runtime v0.0.0-20240722232727-5f321dd941eb/go.mod h1:EOQpzfwX2k5ma0OxH824MgOF4hwrHa63qewkR7dEwFQ=
-k8s.io/client-go v0.0.0-20240724010704-ac9204c6195b h1:NTLYx38CAu+VstHvPLosqB6uSQUtSM+3Mqz2D/C5JpE=
-k8s.io/client-go v0.0.0-20240724010704-ac9204c6195b/go.mod h1:Y6CzOT21oLI4O66cjiV5oSSUgOL7gG/VCG9n8XI8OxU=
-k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440 h1:14X+5sRQRsul6tLxIKTP0/DotvWlMd9DFCgMqHP1hZY=
-k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440/go.mod h1:dj2Pl05aLcVMZi2NXcwv+M/WdUVPEkisFPjDze7rbSk=
-k8s.io/component-helpers v0.0.0-20240723204758-b05521a7bd36 h1:1d/BKG+qwNzedOVzqgMMtgf++8AvXDwTFNPsb6HZbcI=
-k8s.io/component-helpers v0.0.0-20240723204758-b05521a7bd36/go.mod h1:hbv+hLcDM9+GDpLPvr5PeUDzL/ejWs1BWz/+rjY+h8s=
+k8s.io/cli-runtime v0.0.0-20240801013340-86e7f902dfd7 h1:gi3sqU0PRORZ0CS6QQlnPMhxv96hMPJJZ5dbyeaKTTU=
+k8s.io/cli-runtime v0.0.0-20240801013340-86e7f902dfd7/go.mod h1:SfmwgR3hZdYjUpK/PwbG+AIw2zKyuMMpcEUcbY3t84M=
+k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9 h1:FtksMSsr8nNBmsSXlqvs3hPE/7BJ5wI/mJYjGypoEtk=
+k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9/go.mod h1:2bbCJ3Sd+yFlCoexz86XNKsJ8hBFUVTeHsjEhrODbfE=
+k8s.io/component-base v0.0.0-20240801005513-6332889bcf10 h1:tHph4IwKpAlb5BF1qvmAiZPsekcg7ulTIhHrGrw/OgY=
+k8s.io/component-base v0.0.0-20240801005513-6332889bcf10/go.mod h1:4BSQhq9G+cFOChP5FQhxewvI8nzmsOPyetLz/Gh2Npw=
+k8s.io/component-helpers v0.0.0-20240801005738-7473aa8e4624 h1:E0jYroB2MWT+S89dZ5MJl88GJ3AFbdwze9tf4fVbl3k=
+k8s.io/component-helpers v0.0.0-20240801005738-7473aa8e4624/go.mod h1:JTrmzTQ8QwtfaTorVWUlvxR81NHDSd+8CFOy8B+T/4o=
 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-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=