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
This commit is contained in:
Kubernetes Publisher
2025-12-22 16:28:32 -08:00
2 changed files with 15 additions and 15 deletions
+5 -5
View File
@@ -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
)