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

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

diff --cc go.mod
Simple merge

diff --cc go.sum
Simple merge

diff --cc staging/src/k8s.io/api/go.mod
index 4b5fb8151b4cc82cd60e7a35f9468a2370f0a4ea,8b17499e9c5c17f74f5c71eb6e53cbe7b79ba8d8..e2596fe04a87c279dd3a17e06daede990a24e5de
--- 1/staging/src/k8s.io/api/go.mod
--- 2/staging/src/k8s.io/api/go.mod
+++ b/staging/src/k8s.io/api/go.mod
@@@ -28,10 -28,10 +28,10 @@@ require 
        gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
        gopkg.in/inf.v0 v0.9.1 // indirect
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // 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
        sigs.k8s.io/yaml v1.6.0 // indirect
  )
  

diff --cc staging/src/k8s.io/api/go.sum
Simple merge

diff --cc staging/src/k8s.io/apiextensions-apiserver/go.mod
index ab31d15ca88aef160355cc4ea7f549df74a5e9e2,e5b0686d69acedce39046a7d6e93b287b14a3053..a99951749ad9b16e4f3419c2115567e3dd84777c
--- 1/staging/src/k8s.io/apiextensions-apiserver/go.mod
--- 2/staging/src/k8s.io/apiextensions-apiserver/go.mod
+++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod
@@@ -34,10 -34,10 +34,10 @@@ require 
        k8s.io/component-base v0.0.0
        k8s.io/klog/v2 v2.130.1
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
 +      k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7
        sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
        sigs.k8s.io/randfill v1.0.0
-       sigs.k8s.io/structured-merge-diff/v6 v6.3.0
+       sigs.k8s.io/structured-merge-diff/v6 v6.3.1
        sigs.k8s.io/yaml v1.6.0
  )
  

diff --cc staging/src/k8s.io/apiextensions-apiserver/go.sum
Simple merge

diff --cc staging/src/k8s.io/apimachinery/go.mod
index e409600a17e00c33decada877b59afdf837883b2,817bcdccedce9f123040f4a7132384c5d28bdd70..023d6c33d60ef33d9ab3f915d5a72e38ecb44e38
--- 1/staging/src/k8s.io/apimachinery/go.mod
--- 2/staging/src/k8s.io/apimachinery/go.mod
+++ b/staging/src/k8s.io/apimachinery/go.mod
@@@ -24,10 -24,10 +24,10 @@@ require 
        gopkg.in/inf.v0 v0.9.1
        k8s.io/klog/v2 v2.130.1
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
 +      k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7
        sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
        sigs.k8s.io/randfill v1.0.0
-       sigs.k8s.io/structured-merge-diff/v6 v6.3.0
+       sigs.k8s.io/structured-merge-diff/v6 v6.3.1
        sigs.k8s.io/yaml v1.6.0
  )
  

diff --cc staging/src/k8s.io/apimachinery/go.sum
Simple merge

diff --cc staging/src/k8s.io/apiserver/go.mod
index 3d3678e012a9a0f86efca4d6af5c9ef9ae0dc48f,0cb137a7779b7d79c0f70bb7198469a7e9616380..777e839975e27a17d640335c6058460a7cab4724
--- 1/staging/src/k8s.io/apiserver/go.mod
--- 2/staging/src/k8s.io/apiserver/go.mod
+++ b/staging/src/k8s.io/apiserver/go.mod
@@@ -55,11 -55,11 +55,11 @@@ require 
        k8s.io/klog/v2 v2.130.1
        k8s.io/kms v0.0.0
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
 -      sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2
 +      k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7
 +      sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0
        sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
        sigs.k8s.io/randfill v1.0.0
-       sigs.k8s.io/structured-merge-diff/v6 v6.3.0
+       sigs.k8s.io/structured-merge-diff/v6 v6.3.1
        sigs.k8s.io/yaml v1.6.0
  )
  

diff --cc staging/src/k8s.io/apiserver/go.sum
Simple merge

diff --cc staging/src/k8s.io/cli-runtime/go.mod
Simple merge

diff --cc staging/src/k8s.io/cli-runtime/go.sum
Simple merge

diff --cc staging/src/k8s.io/client-go/go.mod
index a10bfa052e0a5647ad7b0136cad996e240860499,ca8635c3bbba935a3d6e3364b88afcc75b31fbf1..a19507f829b0758c71f84c09eacbac11164673dc
--- 1/staging/src/k8s.io/client-go/go.mod
--- 2/staging/src/k8s.io/client-go/go.mod
+++ b/staging/src/k8s.io/client-go/go.mod
@@@ -27,10 -28,10 +27,10 @@@ require 
        k8s.io/apimachinery v0.0.0
        k8s.io/klog/v2 v2.130.1
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
 +      k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7
        sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
        sigs.k8s.io/randfill v1.0.0
-       sigs.k8s.io/structured-merge-diff/v6 v6.3.0
+       sigs.k8s.io/structured-merge-diff/v6 v6.3.1
        sigs.k8s.io/yaml v1.6.0
  )
  

diff --cc staging/src/k8s.io/client-go/go.sum
Simple merge

diff --cc staging/src/k8s.io/cloud-provider/go.mod
index 82c74fdee46ce2427180912ff77ad296255f109f,bb7a3bbf439f32831c8434c9ac9f26369c2b3da4..c2f52c1aa7a47d6831843393b7b6f7be5a1b2496
--- 1/staging/src/k8s.io/cloud-provider/go.mod
--- 2/staging/src/k8s.io/cloud-provider/go.mod
+++ b/staging/src/k8s.io/cloud-provider/go.mod
@@@ -105,10 -104,10 +105,10 @@@ require 
        gopkg.in/yaml.v3 v3.0.1 // indirect
        k8s.io/kms v0.0.0 // indirect
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 -      sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
 +      sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // 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
  )
  

diff --cc staging/src/k8s.io/cloud-provider/go.sum
Simple merge

diff --cc staging/src/k8s.io/cluster-bootstrap/go.mod
index 31b1401bfd40055fc4c322540840084de7a5258d,d4cc13889f205c0061ee0183e3453095659b0ad4..0ffa41e4dc78cd1120c71e752bb80a6e14c752ac
--- 1/staging/src/k8s.io/cluster-bootstrap/go.mod
--- 2/staging/src/k8s.io/cluster-bootstrap/go.mod
+++ b/staging/src/k8s.io/cluster-bootstrap/go.mod
@@@ -31,10 -31,10 +31,10 @@@ require 
        gopkg.in/inf.v0 v0.9.1 // indirect
        gopkg.in/yaml.v3 v3.0.1 // indirect
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // 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
  )
  
  replace (

diff --cc staging/src/k8s.io/cluster-bootstrap/go.sum
Simple merge

diff --cc staging/src/k8s.io/code-generator/examples/go.mod
Simple merge

diff --cc staging/src/k8s.io/code-generator/examples/go.sum
Simple merge

diff --cc staging/src/k8s.io/code-generator/go.mod
Simple merge

diff --cc staging/src/k8s.io/code-generator/go.sum
Simple merge

diff --cc staging/src/k8s.io/component-base/go.mod
Simple merge

diff --cc staging/src/k8s.io/component-base/go.sum
Simple merge

diff --cc staging/src/k8s.io/component-helpers/go.mod
Simple merge

diff --cc staging/src/k8s.io/component-helpers/go.sum
Simple merge

diff --cc staging/src/k8s.io/controller-manager/go.mod
index 4ceedc526fa4e9c81c8eda47b715b436824dbfc4,d84f5ae47516d7a680489e2b78d81c793db5bef7..9a2220f52f87bf3265a4bbb38efbfd293a8b9826
--- 1/staging/src/k8s.io/controller-manager/go.mod
--- 2/staging/src/k8s.io/controller-manager/go.mod
+++ b/staging/src/k8s.io/controller-manager/go.mod
@@@ -96,10 -96,10 +96,10 @@@ require 
        gopkg.in/inf.v0 v0.9.1 // indirect
        gopkg.in/yaml.v3 v3.0.1 // indirect
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 -      sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
 +      sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // 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
  )
  

diff --cc staging/src/k8s.io/controller-manager/go.sum
Simple merge

diff --cc staging/src/k8s.io/cri-client/go.mod
Simple merge

diff --cc staging/src/k8s.io/cri-client/go.sum
Simple merge

diff --cc staging/src/k8s.io/csi-translation-lib/go.mod
index e5b5b33f641632f58a3531769f541abf0a768022,ce673d470077a46db050b1769292975b39856f1f..6d0d889f2d638f12cd7eeece9708a7d7e97ad7c9
--- 1/staging/src/k8s.io/csi-translation-lib/go.mod
--- 2/staging/src/k8s.io/csi-translation-lib/go.mod
+++ b/staging/src/k8s.io/csi-translation-lib/go.mod
@@@ -30,10 -30,10 +30,10 @@@ require 
        gopkg.in/inf.v0 v0.9.1 // indirect
        gopkg.in/yaml.v3 v3.0.1 // indirect
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // 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
  )
  
  replace (

diff --cc staging/src/k8s.io/csi-translation-lib/go.sum
Simple merge

diff --cc staging/src/k8s.io/dynamic-resource-allocation/go.mod
Simple merge

diff --cc staging/src/k8s.io/dynamic-resource-allocation/go.sum
Simple merge

diff --cc staging/src/k8s.io/endpointslice/go.mod
Simple merge

diff --cc staging/src/k8s.io/endpointslice/go.sum
Simple merge

diff --cc staging/src/k8s.io/kube-aggregator/go.mod
index d8abb70e9c63f7811b9b34fc5baa99497dcc7c08,4c3399638d5ab93bcc4a87d06194a36867f11a96..029fb73ee4e64b612cd6e04ed59ae43ceca5a276
--- 1/staging/src/k8s.io/kube-aggregator/go.mod
--- 2/staging/src/k8s.io/kube-aggregator/go.mod
+++ b/staging/src/k8s.io/kube-aggregator/go.mod
@@@ -24,9 -24,9 +24,9 @@@ require 
        k8s.io/component-base v0.0.0
        k8s.io/klog/v2 v2.130.1
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
 +      k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7
        sigs.k8s.io/randfill v1.0.0
-       sigs.k8s.io/structured-merge-diff/v6 v6.3.0
+       sigs.k8s.io/structured-merge-diff/v6 v6.3.1
  )
  
  require (

diff --cc staging/src/k8s.io/kube-aggregator/go.sum
Simple merge

diff --cc staging/src/k8s.io/kube-controller-manager/go.mod
index 20c4592e4d11c1c2fdb2a883c7aa046c1213a9fc,fbe83496da58666403b454562a05a8502f771f21..047b2799644f66c2a9257c65a932dbdcf4c0d894
--- 1/staging/src/k8s.io/kube-controller-manager/go.mod
--- 2/staging/src/k8s.io/kube-controller-manager/go.mod
+++ b/staging/src/k8s.io/kube-controller-manager/go.mod
@@@ -28,10 -28,10 +28,10 @@@ require 
        k8s.io/component-base v0.0.0 // 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-20251002143259-bc988d571ff4 // 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
  )
  
  replace (

diff --cc staging/src/k8s.io/kube-controller-manager/go.sum
Simple merge

diff --cc staging/src/k8s.io/kube-proxy/go.mod
index 453d2c5b728231ee13863f824e74645bcf069b3b,5bf4511ef6c672eb21d4c976949c8e95347da8c5..0df5f038899f4b786facbca1875229a59641a414
--- 1/staging/src/k8s.io/kube-proxy/go.mod
--- 2/staging/src/k8s.io/kube-proxy/go.mod
+++ b/staging/src/k8s.io/kube-proxy/go.mod
@@@ -42,10 -42,10 +42,10 @@@ require 
        gopkg.in/inf.v0 v0.9.1 // 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-20251002143259-bc988d571ff4 // 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
        sigs.k8s.io/yaml v1.6.0 // indirect
  )
  

diff --cc staging/src/k8s.io/kube-proxy/go.sum
Simple merge

diff --cc staging/src/k8s.io/kube-scheduler/go.mod
index 2a25dc04487b518bd7ea69cb2e61bec614f0901a,ed76c952db88fe7e80e424fda8b70bbbd45c929a..a37dce3451d290f757b01252113ce3c0d227c2e4
--- 1/staging/src/k8s.io/kube-scheduler/go.mod
--- 2/staging/src/k8s.io/kube-scheduler/go.mod
+++ b/staging/src/k8s.io/kube-scheduler/go.mod
@@@ -70,10 -70,10 +70,10 @@@ require 
        gopkg.in/yaml.v3 v3.0.1 // indirect
        k8s.io/apiserver v0.0.0 // indirect
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // 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
  )
  
  replace (

diff --cc staging/src/k8s.io/kube-scheduler/go.sum
Simple merge

diff --cc staging/src/k8s.io/kubectl/go.mod
Simple merge

diff --cc staging/src/k8s.io/kubectl/go.sum
Simple merge

diff --cc staging/src/k8s.io/kubelet/go.mod
Simple merge

diff --cc staging/src/k8s.io/kubelet/go.sum
Simple merge

diff --cc staging/src/k8s.io/metrics/go.mod
index 1ed69997bca50c86df018c1b7d29d8988494273d,542f85b57debe943bc57576fdd79172e1a5d6f65..01deee31e9faa0469e308677c8176236a1b4437c
--- 1/staging/src/k8s.io/metrics/go.mod
--- 2/staging/src/k8s.io/metrics/go.mod
+++ b/staging/src/k8s.io/metrics/go.mod
@@@ -52,10 -52,10 +52,10 @@@ require 
        k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // 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-20251002143259-bc988d571ff4 // 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
        sigs.k8s.io/yaml v1.6.0 // indirect
  )
  

diff --cc staging/src/k8s.io/metrics/go.sum
Simple merge

diff --cc staging/src/k8s.io/pod-security-admission/go.mod
index 197832eb025eebfbc84bce12015f6f9b8d3aa992,2b61c5643e5034d1cb4658d086f89fffd802deed..68188018c870446f0af3d0ba6abeb3c5680d8000
--- 1/staging/src/k8s.io/pod-security-admission/go.mod
--- 2/staging/src/k8s.io/pod-security-admission/go.mod
+++ b/staging/src/k8s.io/pod-security-admission/go.mod
@@@ -102,10 -101,10 +102,10 @@@ require 
        gopkg.in/yaml.v3 v3.0.1 // indirect
        k8s.io/kms v0.0.0 // indirect
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 -      sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
 +      sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // 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
  )
  
  replace (

diff --cc staging/src/k8s.io/pod-security-admission/go.sum
Simple merge

diff --cc staging/src/k8s.io/sample-apiserver/go.mod
index cd66e87b7c5069e55ad5b9f027b3cd3d2dbc7c76,b3e285f2cbc0d9c29495749773f8881e036a1c82..ffac2e7b07356737070d907996c799254534a64a
--- 1/staging/src/k8s.io/sample-apiserver/go.mod
--- 2/staging/src/k8s.io/sample-apiserver/go.mod
+++ b/staging/src/k8s.io/sample-apiserver/go.mod
@@@ -15,9 -15,9 +15,9 @@@ require 
        k8s.io/code-generator v0.0.0
        k8s.io/component-base v0.0.0
        k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
 -      k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
 +      k8s.io/utils v0.0.0-20251219084037-98d557b7f1e7
        sigs.k8s.io/randfill v1.0.0
-       sigs.k8s.io/structured-merge-diff/v6 v6.3.0
+       sigs.k8s.io/structured-merge-diff/v6 v6.3.1
  )
  
  require (

diff --cc staging/src/k8s.io/sample-apiserver/go.sum
Simple merge

diff --cc staging/src/k8s.io/sample-cli-plugin/go.mod
Simple merge

diff --cc staging/src/k8s.io/sample-cli-plugin/go.sum
Simple merge

diff --cc staging/src/k8s.io/sample-controller/go.mod
Simple merge

diff --cc staging/src/k8s.io/sample-controller/go.sum
Simple merge

diff --cc vendor/modules.txt
Simple merge