Merge pull request #135391 from jpbetz/smd-6_3_1

Bump structured-merge-diff to pick up flake fix and bug fixes

Kubernetes-commit: 6f92c01979b7666f6631a556a8626e21b88d1f2a

Author: k8s-publishing-bot

go.mod

@@ -7,9 +7,9 @@ go 1.25.0
 godebug default=go1.25
 
 require (
-	k8s.io/apimachinery v0.0.0-20251221022210-2a337e1bb217
-	k8s.io/cloud-provider v0.0.0-20251223151907-889621780fab
-	k8s.io/controller-manager v0.0.0-20251223151715-44b49e0008fd
+	k8s.io/apimachinery v0.0.0-20251223142228-10257273d7e7
+	k8s.io/cloud-provider v0.0.0-20251223151909-65aef96cfa49
+	k8s.io/controller-manager v0.0.0-20251223151716-5616aa98c452
 )
 
 require (
@@ -25,11 +25,11 @@ require (
 	golang.org/x/text v0.31.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	k8s.io/component-base v0.0.0-20251221024012-26c758a07d12 // indirect
+	k8s.io/component-base v0.0.0-20251223144127-af45865c7961 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 	k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7 // indirect
 	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
 )

go.sum

@@ -53,16 +53,16 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 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.0.0-20251221022517-273786d760b8 h1:N79zusupHJpdH2pj6i0KgAV0Vl1yW4Pjf7j65X6MQsw=
-k8s.io/api v0.0.0-20251221022517-273786d760b8/go.mod h1:eDNsQ+QLVDk3rCDjzIxcOJDvchm9cM/4xs2ZIWjAW80=
-k8s.io/apimachinery v0.0.0-20251221022210-2a337e1bb217 h1:jlon/XvIJ04U8RINeKTGQo4spQw9yFPeeXHWnMHhCWs=
-k8s.io/apimachinery v0.0.0-20251221022210-2a337e1bb217/go.mod h1:hVKyk5rzKPzVNqOfNze3e2edChtIAn+NMFPDVD5nyEU=
-k8s.io/cloud-provider v0.0.0-20251223151907-889621780fab h1:RBr8g3Cm4I+VosqOtrftAAZRMWdw5RvtJD2p+5BIRkc=
-k8s.io/cloud-provider v0.0.0-20251223151907-889621780fab/go.mod h1:Q501jLceCPSsOTY2PwdggIg9tdSRBVch8+I94C6FG1Q=
-k8s.io/component-base v0.0.0-20251221024012-26c758a07d12 h1:0CWml/OyutmOH4ERaRcf/2Msnf1JUiQy+K/TNYm9c3o=
-k8s.io/component-base v0.0.0-20251221024012-26c758a07d12/go.mod h1:N6fKUHnQDUQgNkhVlxHDLqNIjc8LkGIK9U0c0vDcYnE=
-k8s.io/controller-manager v0.0.0-20251223151715-44b49e0008fd h1:+hVjp7ydBczw5d884Mo2AkQaJp7aDgqSQpACzn/1/rs=
-k8s.io/controller-manager v0.0.0-20251223151715-44b49e0008fd/go.mod h1:0y2Dggj53QOuUFY6xeVhhvlGMDqB7cLVIZJOoLXqz4Q=
+k8s.io/api v0.0.0-20251223142543-49b7fdb8413e h1:LzUvqdOqvu9sv5CRELRFmZyOc0OZpkffmQpQStncYyo=
+k8s.io/api v0.0.0-20251223142543-49b7fdb8413e/go.mod h1:6bJjOS8ww83H+5m1wb7JJw1NHEOZiCabMdNDjRmR2NY=
+k8s.io/apimachinery v0.0.0-20251223142228-10257273d7e7 h1:6PdG2x/Z3kYAoRAoiHaJ/DzTgMdY/E73+GKxrMWJvok=
+k8s.io/apimachinery v0.0.0-20251223142228-10257273d7e7/go.mod h1:4mERM8sOoVa6HQ0eN/MFv1Q18wFYr64mgZRlZqiwnX0=
+k8s.io/cloud-provider v0.0.0-20251223151909-65aef96cfa49 h1:qJVchgvEyNlBWiEuoYhts/eZvd4j895XCaYOr+BE4kg=
+k8s.io/cloud-provider v0.0.0-20251223151909-65aef96cfa49/go.mod h1:Cfgs4rD04FR7X/I6A5ImoftkOJlBgx4uyywqXTbuMtg=
+k8s.io/component-base v0.0.0-20251223144127-af45865c7961 h1:EKm+sz3eHar9BFS6EtHmL9+Kf00CrgMHbZ2bYifBCHo=
+k8s.io/component-base v0.0.0-20251223144127-af45865c7961/go.mod h1:ZIC9uvuLPK/4xNNbdRo4OWHw4y6NeD94loNfGDgJqUY=
+k8s.io/controller-manager v0.0.0-20251223151716-5616aa98c452 h1:g+qr9hSqlbv/lAQvpOiVnz39cQC4tsTqfZ/eXwdEYHU=
+k8s.io/controller-manager v0.0.0-20251223151716-5616aa98c452/go.mod h1:9kGsYLWhV8hbDqYS7vtbCf7QYYl7ttv8Kaw1WytMmAY=
 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-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
@@ -73,7 +73,7 @@ sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5E
 sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
-sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
-sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.1 h1:JrhdFMqOd/+3ByqlP2I45kTOZmTRLBUm5pvRjeheg7E=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.1/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
 sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
 sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=