Merge pull request #132942 from thockin/kyaml

Add KYAML support to kubectl Kubernetes-commit: 1451dd1b0873e801e082f3a06a52685bcd68dcac
Merge pull request #132935 from benluddy/cbor-bump-custom-marshalers
2025-07-25 03:35:17 +00:00 · 2025-07-24 23:34:28 +00:00 · 2025-07-24 11:46:03 -07:00 · 2025-06-24 14:25:43 -04:00 · 2025-07-18 01:58:36 +00:00 · 2025-07-16 08:07:00 +00:00
2 changed files with 22 additions and 26 deletions
--- a/go.mod
+++ b/go.mod
@ -7,13 +7,13 @@ go 1.24.0
 godebug default=go1.24
 require (
-	k8s.io/apimachinery v0.0.0-20250703010150-b86b632271cf
+	k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4
-	k8s.io/cloud-provider v0.0.0-20250703015754-f0792df8b702
+	k8s.io/cloud-provider v0.0.0-20250725033350-fdfe77cfed3d
-	k8s.io/controller-manager v0.0.0-20250703015616-2d456cf8a782
+	k8s.io/controller-manager v0.0.0-20250725033211-9760cfa9d20d
 )
 require (
-	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@ -26,11 +26,10 @@ require (
 	golang.org/x/text v0.23.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-20250703012258-22a26817cb48 // indirect
+	k8s.io/component-base v0.0.0-20250725025923-b9f1c2d98961 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 	sigs.k8s.io/yaml v1.5.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -2,13 +2,12 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
-github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@ -83,27 +82,25 @@ 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-20250703010437-9ca4bf8538e0 h1:iS/S3wfNTxgeC+HNybNhVSLt7y9E1XDkUlzPRXd1c6U=
+k8s.io/api v0.0.0-20250725024535-b95b43d5b95d h1:OdC1L69BYvh/4HX6Wgg7DeL0A++gD3gadKfaWT4IdbA=
-k8s.io/api v0.0.0-20250703010437-9ca4bf8538e0/go.mod h1:2FUvtol5X8X7D4iFOQdd1W2Q6BoMhvE/DSSRzyWQ2yU=
+k8s.io/api v0.0.0-20250725024535-b95b43d5b95d/go.mod h1:wKZv1VB6nzJ6L449TteVelrBfRsawhrthiOsEylKo8U=
-k8s.io/apimachinery v0.0.0-20250703010150-b86b632271cf h1:5z7lkImscG/qu7KON0TOD0aSsycwXXiWue9mrjDasu4=
+k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4 h1:N25HX4lRPTvLHSUPoCMFP+B/oEcOmPESB+BRkYMD8Io=
-k8s.io/apimachinery v0.0.0-20250703010150-b86b632271cf/go.mod h1:Th679JJyaVRDNFk3vKPKY43ypziDeoGnbEiEgBCz8s4=
+k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
-k8s.io/cloud-provider v0.0.0-20250703015754-f0792df8b702 h1:cvmkXdNpvBmlWNBN8CiO0NGuKJMntG0gshMCZbgM5eo=
+k8s.io/cloud-provider v0.0.0-20250725033350-fdfe77cfed3d h1:+flsjKbTSOmlVxy5fFlRhTHP0+EOrR3C0MRhRxMKZSo=
-k8s.io/cloud-provider v0.0.0-20250703015754-f0792df8b702/go.mod h1:pHDwVAWETH4o8Ueu3QTr7/oJv2E9qofqaQk1fkD3Imw=
+k8s.io/cloud-provider v0.0.0-20250725033350-fdfe77cfed3d/go.mod h1:fINq+oc2l6lCnZCD+8U3yJEJyAsnBcBS2MmqG49GAjg=
-k8s.io/component-base v0.0.0-20250703012258-22a26817cb48 h1:bgA0NLAleN9Rl3z3oq1qc1pxD3hJRPTIVMqWPCZpMXg=
+k8s.io/component-base v0.0.0-20250725025923-b9f1c2d98961 h1:gWZcTfCQXU9F1Yqzs0dRUxDKI6fxb+1hqrzd8XAP8y0=
-k8s.io/component-base v0.0.0-20250703012258-22a26817cb48/go.mod h1:t81Uof8wYmumUbjkD/V/shpkjxjPcK+dYKWuJGVI1Lw=
+k8s.io/component-base v0.0.0-20250725025923-b9f1c2d98961/go.mod h1:+EKWDhmrFYENWq8vZZtJ9DvxEebCdVtSK4MGTw6CDuE=
-k8s.io/controller-manager v0.0.0-20250703015616-2d456cf8a782 h1:1n3ilc78nG3ADd/40Aja64RdVsSqj1whfNFe4F9bxeg=
+k8s.io/controller-manager v0.0.0-20250725033211-9760cfa9d20d h1:G+0GNXVM3Zt/RVuWkzD+upbrHJ34hIV4oAzbOxWtiw8=
-k8s.io/controller-manager v0.0.0-20250703015616-2d456cf8a782/go.mod h1:J8ZkRHMAbzmaiNmbErbe5V6M/TUVWzotcLK8vqax0Mw=
+k8s.io/controller-manager v0.0.0-20250725033211-9760cfa9d20d/go.mod h1:5R32tRxIflTYn6XMAUbxWz1KBeO4/ehuN+TP10vZ4sA=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 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/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
-sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
-sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
+sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
-sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
+sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
 sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
Author	SHA1	Message	Date
Kubernetes Publisher	8c9e77a8d8	Merge pull request #132942 from thockin/kyaml Add KYAML support to kubectl Kubernetes-commit: 1451dd1b0873e801e082f3a06a52685bcd68dcac	2025-07-25 03:35:17 +00:00
Kubernetes Publisher	1e5334379d	Merge pull request #132935 from benluddy/cbor-bump-custom-marshalers KEP-4222: Adopt text and JSON transcoding support for CBOR. Kubernetes-commit: dfc0998baa4d6c2cd630aa3c5b8def4e9b1fcd8e	2025-07-24 23:34:28 +00:00
Tim Hockin	9920e1ec9e	Re-vendor sigs.k8s.io/yaml @ v1.6.0 Kubernetes-commit: 8182a27f3b0769cefe1bcebfb938a7bafd51c88e	2025-07-24 11:46:03 -07:00
Ben Luddy	58b4c11c7d	Bump to github.com/fxamacker/cbor/v2 v2.9.0. Kubernetes-commit: 917659269af60f8ca960deeb0991df93e5ad1635	2025-06-24 14:25:43 -04:00
Kubernetes Publisher	f87c87f82a	Merge pull request #133010 from cici37/promote-Cel Bump cel-go to v0.26.0 Kubernetes-commit: c72ff99928c6edbec1619d78f66e1f5f660d24c3	2025-07-18 01:58:36 +00:00
Cici Huang	c1d0484f49	Update cel-go to v0.26.0 Kubernetes-commit: cedcbfb94c35fb7e268555f2dd3185a4f805ad05	2025-07-16 08:07:00 +00:00
Kubernetes Publisher	88cec719fe	Merge pull request #133020 from pohly/apimachinery-list-map-keys support optional listMapKeys in server-side apply Kubernetes-commit: d33af7f7efc7ff5d8813a85290189883167a5226	2025-07-17 17:58:41 +00:00
Jordan Liggitt	8f727765ad	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 Kubernetes-commit: 4d34975a46658efd90274c5fe05d46732e04ca67	2025-07-16 16:57:41 -04:00
Kubernetes Publisher	42241a82a9	Merge pull request #132871 from dims/bump-k8s.io/kube-openapi-to-latest-SHA-f3f2b991d03b Bump k8s.io/kube-openapi to latest SHA (f3f2b991d03b) and sigs.k8s.io/structured-merge-diff/{v4 => v6} Kubernetes-commit: 48e04d0d6c43cfc4729857775252b89b68d65b87	2025-07-15 10:01:07 +00:00
Davanum Srinivas	65282c0cca	Bump k8s.io/kube-openapi to latest SHA (f3f2b991d03b) Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: ebc1ccc491c944fa0633f147698e0dc02675051d	2025-07-10 09:21:52 -04:00