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

@@ -8,10 +8,10 @@ godebug default=go1.25
 
 require (
 	golang.org/x/time v0.9.0
-	k8s.io/api v0.0.0-20251221022517-273786d760b8
-	k8s.io/apimachinery v0.0.0-20251221022210-2a337e1bb217
-	k8s.io/client-go v0.0.0-20251221022937-af9dcc36515d
-	k8s.io/code-generator v0.0.0-20251221023808-e1db8cb04dec
+	k8s.io/api v0.0.0-20251223142543-49b7fdb8413e
+	k8s.io/apimachinery v0.0.0-20251223142228-10257273d7e7
+	k8s.io/client-go v0.0.0-20251223143015-d9d16a9e173d
+	k8s.io/code-generator v0.0.0-20251223143918-31a3da13dc85
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7
 )
@@ -53,6 +53,6 @@ require (
 	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // 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
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )

go.sum

@@ -115,14 +115,14 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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/client-go v0.0.0-20251221022937-af9dcc36515d h1:rDg5rieglmTFzneVpZ5n0O2yzj2dOp49v2smiRXK7qU=
-k8s.io/client-go v0.0.0-20251221022937-af9dcc36515d/go.mod h1:xu6FvyGGhnOBzxkq8vsdotaDYGAIv9XewafWprMJrhk=
-k8s.io/code-generator v0.0.0-20251221023808-e1db8cb04dec h1:pa3i1d0U2RqJTT/BUEykp68BaQS0dKwNsL2Xr3rLAew=
-k8s.io/code-generator v0.0.0-20251221023808-e1db8cb04dec/go.mod h1:Xsrfj1LNNb62oa24Ca2JmDTEQILThDQFWAyMXp6DEf8=
+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/client-go v0.0.0-20251223143015-d9d16a9e173d h1:6VLYmb1qYHKGdLJOp8RvFIbW0cpqmKXU5thKOHDX3PU=
+k8s.io/client-go v0.0.0-20251223143015-d9d16a9e173d/go.mod h1:yQi9zOsCJ/SiDlQWme0fBONYF8hLGs7Tgso0lpKZyio=
+k8s.io/code-generator v0.0.0-20251223143918-31a3da13dc85 h1:PHgiA3OrHLxwb7R9yPUP5txLmlLoP2GCe0Ogryi+01A=
+k8s.io/code-generator v0.0.0-20251223143918-31a3da13dc85/go.mod h1:VXmXOB1SyZaxrWHudGi6uhyDTp9JerwCDW/suZV3dFE=
 k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ=
 k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
@@ -135,7 +135,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=