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

@@ -15,13 +15,13 @@ require (
 	github.com/stretchr/testify v1.11.1
 	go.etcd.io/etcd/client/pkg/v3 v3.6.6
 	google.golang.org/grpc v1.75.0
-	k8s.io/api v0.0.0-20251221022517-273786d760b8
-	k8s.io/apimachinery v0.0.0-20251221022210-2a337e1bb217
-	k8s.io/apiserver v0.0.0-20251223145015-8b5e8433f2bf
-	k8s.io/client-go v0.0.0-20251221022937-af9dcc36515d
-	k8s.io/component-helpers v0.0.0-20251221024140-291c30c45294
+	k8s.io/api v0.0.0-20251223142543-49b7fdb8413e
+	k8s.io/apimachinery v0.0.0-20251223142228-10257273d7e7
+	k8s.io/apiserver v0.0.0-20251223145017-54a2c75fa1a7
+	k8s.io/client-go v0.0.0-20251223143015-d9d16a9e173d
+	k8s.io/component-helpers v0.0.0-20251223144302-5042f4d06524
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubelet v0.0.0-20251223151533-0f129d7be144
+	k8s.io/kubelet v0.0.0-20251223151534-c4e64c5a7d4c
 	k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7
 )
 
@@ -75,10 +75,10 @@ require (
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/component-base v0.0.0-20251221024012-26c758a07d12 // indirect
+	k8s.io/component-base v0.0.0-20251223144127-af45865c7961 // indirect
 	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

@@ -176,31 +176,31 @@ 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/apiserver v0.0.0-20251223145015-8b5e8433f2bf h1:2WLNyJ3TLLdnhbwQqXTQrgjstlPgigdCXU4CqokXkFY=
-k8s.io/apiserver v0.0.0-20251223145015-8b5e8433f2bf/go.mod h1:SsUqHwWSdCeT6eliXTcSkB1AT/+ZQLcx/q7W7GyTCNY=
-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/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/component-helpers v0.0.0-20251221024140-291c30c45294 h1:c4dFJ5AVRk9iXy6dswE2Yf8nn1F5ZeTp7SsoslsiJ6E=
-k8s.io/component-helpers v0.0.0-20251221024140-291c30c45294/go.mod h1:kQAgMUU0PvY8sZc2mEm+5mlRwAnJ2YdxdNCbpITR1fc=
+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/apiserver v0.0.0-20251223145017-54a2c75fa1a7 h1:AzeuVWISJ1tI8kiLMROp5c+NZSHH8SfKgX3mes5PMGQ=
+k8s.io/apiserver v0.0.0-20251223145017-54a2c75fa1a7/go.mod h1:FLuA7VqyG8yD5D8THybs2DQ2hA9cifRdxuYl+iqg/iU=
+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/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/component-helpers v0.0.0-20251223144302-5042f4d06524 h1:q5KJwLe8gev+rov0uiCI6oMmZCDmYr+cXH+74rOwA5k=
+k8s.io/component-helpers v0.0.0-20251223144302-5042f4d06524/go.mod h1:uKBGA8Wkp69ggwxKsMet3znLXO4jrkIJvLzcyI+A2XE=
 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=
 k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
-k8s.io/kubelet v0.0.0-20251223151533-0f129d7be144 h1:SAaDQnGBMYqFfTKTg0LP9tPX6E4rYAaVHIoMngsq2MI=
-k8s.io/kubelet v0.0.0-20251223151533-0f129d7be144/go.mod h1:YnIQfd5yn60U+/tJnlD9LnqCNt+TOan8GVQ60MmNtm0=
+k8s.io/kubelet v0.0.0-20251223151534-c4e64c5a7d4c h1:Sf4+KQe4C/4m0s3HkiYa9AZBQfUbIanFfTeUXRDje/g=
+k8s.io/kubelet v0.0.0-20251223151534-c4e64c5a7d4c/go.mod h1:2CwbgQ99mxy008Bb5twdsZiE8Z1HHoPvD6sdK6rAao0=
 k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7 h1:H6xtwB5tC+KFSHoEhA1o7DnOtHDEo+n9OBSHjlajVKc=
 k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
 sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
 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=