Merge pull request #128761 from ah8ad3/revert-126533

Revert PR #126533 and add a test case for broken case

Kubernetes-commit: af7581e8ec6839c0eb7405cdd95af3285434cdcb

go.mod

@@ -32,12 +32,12 @@ require (
 	k8s.io/api v0.0.0-20241108114318-6cc44b8953ae
 	k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba
 	k8s.io/cli-runtime v0.0.0-20241105234034-30b82e78f32f
-	k8s.io/client-go v0.0.0-20241108115833-955401ca9a15
-	k8s.io/component-base v0.0.0-20241108123302-804c0075c12f
+	k8s.io/client-go v0.0.0-20241108175443-37045084c2aa
+	k8s.io/component-base v0.0.0-20241108211412-55c45bc78189
 	k8s.io/component-helpers v0.0.0-20241108124227-ea8c930081bd
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
-	k8s.io/metrics v0.0.0-20241105233853-0eafb3f269f4
+	k8s.io/metrics v0.0.0-20241108213631-40655fb5b014
 	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
 	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3
 	sigs.k8s.io/kustomize/kustomize/v5 v5.5.0
@@ -93,5 +93,3 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	sigs.k8s.io/kustomize/api v0.18.0 // indirect
 )
-
-replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20241108122330-dd3711df8d22

go.sum

@@ -208,18 +208,18 @@ k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba h1:ghB5Iygt6Ge8UyIwW7C1kJ
 k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba/go.mod h1:HqhdaJUgQqky29T1V0o2yFkt/pZqLFIDyn9Zi/8rxoY=
 k8s.io/cli-runtime v0.0.0-20241105234034-30b82e78f32f h1:MV1YnjgZhMzrdCt6HNUhCycAg6uphIgNgbyAyj4DBOI=
 k8s.io/cli-runtime v0.0.0-20241105234034-30b82e78f32f/go.mod h1:oIRjGaIr68S/l7upHJzyiY4jZEljXlaDA506QlTpDS8=
-k8s.io/client-go v0.0.0-20241108115833-955401ca9a15 h1:0OnDjUEXj3mhxJUiBBRGOLrXQ8aj5zvidfDlI2SCoew=
-k8s.io/client-go v0.0.0-20241108115833-955401ca9a15/go.mod h1:DojZKPG2ohOKreFao9yo2wFG1IL9OXebT+Q9ytnREY8=
-k8s.io/component-base v0.0.0-20241108123302-804c0075c12f h1:zBczlQ6ESDT3aiohj4+/Bl8IWFr8VX6WHXX785ovbIg=
-k8s.io/component-base v0.0.0-20241108123302-804c0075c12f/go.mod h1:sML5FQmBLTD6jQvLcucPw9JohoW6PnlBvP7NBkLIYb8=
+k8s.io/client-go v0.0.0-20241108175443-37045084c2aa h1:iY+s3vejL9yeoJGLOjh314JZtg76ZOjiIETKAnlTUfs=
+k8s.io/client-go v0.0.0-20241108175443-37045084c2aa/go.mod h1:DojZKPG2ohOKreFao9yo2wFG1IL9OXebT+Q9ytnREY8=
+k8s.io/component-base v0.0.0-20241108211412-55c45bc78189 h1:RnPIwV9hWuBPXAn69ozUt99OuP/KDuJTIoxYlaJRt4Q=
+k8s.io/component-base v0.0.0-20241108211412-55c45bc78189/go.mod h1:MPazwHX0pvEjtMIsAy4TYw3vrMHUVe1sy4D1o1Xbcwc=
 k8s.io/component-helpers v0.0.0-20241108124227-ea8c930081bd h1:gvbf/dWqrHVoCisvo3gEn3TCIgYtsDD5rMzh0fF+GDU=
 k8s.io/component-helpers v0.0.0-20241108124227-ea8c930081bd/go.mod h1:M/P3FQi94J4zjE2fAWiEIUnCaQNWeM+j9q96LudP3cU=
 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-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
 k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
-k8s.io/metrics v0.0.0-20241105233853-0eafb3f269f4 h1:kTWfdsu88w84rGT8L/OryDSCr9aipjAjHgdqMLywT1E=
-k8s.io/metrics v0.0.0-20241105233853-0eafb3f269f4/go.mod h1:Jpl5ihsicpj2uiYMdE8b7V+HXRWm5Xz6FEflVq62P7Q=
+k8s.io/metrics v0.0.0-20241108213631-40655fb5b014 h1:RYq+cPcoidDLJBp8+VXZoDP2wBeDmkW7xgpCSHyAC3c=
+k8s.io/metrics v0.0.0-20241108213631-40655fb5b014/go.mod h1:WCvk/n97D0QD1cmxQSHVue6BtXf7FlxxtxUbx/MdKUA=
 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=