kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132357 from dims/drop-usage-of-forked-copies-of-goyaml.v2-and-goyaml.v3 

Drop usage of forked copies of goyaml.v2 and goyaml.v3

Kubernetes-commit: c1afec6a0b15ca1ed853c1321ac2c972488bf5b8
This commit is contained in:
Kubernetes Publisher 2025-06-25 09:48:29 -07:00
parent 4966ba7250 7e06b5277c
commit fe571ee1bb
4 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
go.mod
View File

@ -26,24 +26,25 @@ require (
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0
go.yaml.in/yaml/v2 v2.4.2
golang.org/x/sys v0.31.0
gopkg.in/evanphx/json-patch.v4 v4.12.0
k8s.io/api v0.0.0-20250625172518-2872eaf4bc66
k8s.io/apimachinery v0.0.0-20250625172235-f3d86859ab8a
k8s.io/cli-runtime v0.0.0-20250625180655-70ae17def10c
k8s.io/client-go v0.0.0-20250625172909-cf3a9d7f2e18
k8s.io/component-base v0.0.0-20250625174137-670840c797fd
k8s.io/component-helpers v0.0.0-20250625174306-f77bef070f81
k8s.io/api v0.0.0-20250625172519-b820fad6b1cc
k8s.io/apimachinery v0.0.0-20250625172236-d6651abdfec8
k8s.io/cli-runtime v0.0.0-20250625180656-b24f6b404b39
k8s.io/client-go v0.0.0-20250625172911-958288110116
k8s.io/component-base v0.0.0-20250625174139-179392ef0450
k8s.io/component-helpers v0.0.0-20250625174307-2c1c0a306592
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a
k8s.io/metrics v0.0.0-20250625180512-64fb019733cb
k8s.io/metrics v0.0.0-20250625180513-13b7f9a31fc0
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3
sigs.k8s.io/kustomize/kustomize/v5 v5.6.0
sigs.k8s.io/kustomize/kyaml v0.19.0
sigs.k8s.io/randfill v1.0.0
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
sigs.k8s.io/yaml v1.4.0
sigs.k8s.io/yaml v1.5.0
)
require (
@ -80,6 +81,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.yaml.in/yaml/v3 v3.0.3 // indirect
golang.org/x/net v0.38.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/sync v0.12.0 // indirect

35
go.sum
View File

@ -143,6 +143,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@ -197,24 +201,24 @@ 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-20250625172518-2872eaf4bc66 h1:aMd+Jbx+lq4jR0Cq9r8q0sSul6VjNeJZ6uBuMOW7lcs=
k8s.io/api v0.0.0-20250625172518-2872eaf4bc66/go.mod h1:1C5ufHfx8/vwdBx/DXW0BQ7SqsdvoyTyd6wy6XlQPJA=
k8s.io/apimachinery v0.0.0-20250625172235-f3d86859ab8a h1:iaRq1UKD/uPXfwZlW5WMGlKwRMNkA87SkgAurlTZk78=
k8s.io/apimachinery v0.0.0-20250625172235-f3d86859ab8a/go.mod h1:HYUvaFuBNToT/JW+lhc2D9BYgqj6xhI5eORJ7BnvKpM=
k8s.io/cli-runtime v0.0.0-20250625180655-70ae17def10c h1:hki2NGhRYKSOV8vdaqmbdttXDfT7J1wMCu0e+HQ4FtQ=
k8s.io/cli-runtime v0.0.0-20250625180655-70ae17def10c/go.mod h1:ul9Ww7hyT5DpWQuCZV+hIarGpS2G5cWpBQI6QAx7YrY=
k8s.io/client-go v0.0.0-20250625172909-cf3a9d7f2e18 h1:gYfAKTYq8UkW+OsojWUYYuYtXywr8b/GQRGyW58lcG4=
k8s.io/client-go v0.0.0-20250625172909-cf3a9d7f2e18/go.mod h1:DHBCV7+oCeGbWAjutB+9QWRKD4TSQ2ZDlyMY3u6LSVU=
k8s.io/component-base v0.0.0-20250625174137-670840c797fd h1:DfaOuQ5YTgNT6I+8K//HO3lBQxqYnksXx/d1hDrlN3Q=
k8s.io/component-base v0.0.0-20250625174137-670840c797fd/go.mod h1:8XDN50ASDWy5CdtivLOdvBY0JZeDcFhhftTZxa5dABc=
k8s.io/component-helpers v0.0.0-20250625174306-f77bef070f81 h1:F05L8dfGsJWjvHDaLDOHrlIIfMc7jTabD3pclBv4VTg=
k8s.io/component-helpers v0.0.0-20250625174306-f77bef070f81/go.mod h1:9QoaWJg2L1dh7aarSlOWTvWR2l76tyDJHHcfGmoEO2I=
k8s.io/api v0.0.0-20250625172519-b820fad6b1cc h1:sWQaPAV1Sz67sayzJXCBxPybdF77ISLHq5VoMYFBii8=
k8s.io/api v0.0.0-20250625172519-b820fad6b1cc/go.mod h1:LeP8EGRerQcaOFKs8aGWs2rBBrJi5ByIeqfuMPuxCPk=
k8s.io/apimachinery v0.0.0-20250625172236-d6651abdfec8 h1:MsspBt/pf3hqgJCgzv8XGYLMuKtRIKq77uZ13QyJ/eU=
k8s.io/apimachinery v0.0.0-20250625172236-d6651abdfec8/go.mod h1:8gnN3W0XUgFL9P1KdRepAJFA98YuYViPoaUkwNZ1q70=
k8s.io/cli-runtime v0.0.0-20250625180656-b24f6b404b39 h1:xQ6t4JZwm8Jl63K9b39Rf2t3BBqvLNJAUZheO8juxMw=
k8s.io/cli-runtime v0.0.0-20250625180656-b24f6b404b39/go.mod h1:/ZAfCgtsO8qN2eQTMoDWibiv3BRm3LJO0tGLqBZntUQ=
k8s.io/client-go v0.0.0-20250625172911-958288110116 h1:XSKq9Bbohb9kmuZhikSdxLQx02HaHg2xVlavGE64mnM=
k8s.io/client-go v0.0.0-20250625172911-958288110116/go.mod h1:Jz4vyKgB0jnBepznNT5YHdWzDWToklF9cWFW/mFnIc8=
k8s.io/component-base v0.0.0-20250625174139-179392ef0450 h1:nUV4kvIczLp0P70TR+o0w99Zs1BpssHCnZBqT0DrnoQ=
k8s.io/component-base v0.0.0-20250625174139-179392ef0450/go.mod h1:1x8lr7IgSZFmqqCK82ptOofUzOT7UAqyxK/+xKXh9To=
k8s.io/component-helpers v0.0.0-20250625174307-2c1c0a306592 h1:nigNyzQcXWSVYFY9Q+fInwyK6HAc2neeOjQHtRx6YK8=
k8s.io/component-helpers v0.0.0-20250625174307-2c1c0a306592/go.mod h1:7K0IQ3HDLL09je7I28gGXhbf6nk4cqUUfnoNDK3Rh/Y=
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-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
k8s.io/metrics v0.0.0-20250625180512-64fb019733cb h1:2vgjcA7qrOHmcETjgqRQJSHQDnMTlYV8FvREYw8LpVA=
k8s.io/metrics v0.0.0-20250625180512-64fb019733cb/go.mod h1:JVuoaELbsTAddkXzh4lWpKQN6yBPaGqyQMSkyiblD2I=
k8s.io/metrics v0.0.0-20250625180513-13b7f9a31fc0 h1:IUwvTGKHrNbXLqculRG2WUmwNFZw1/E+cTPjV3z/0rY=
k8s.io/metrics v0.0.0-20250625180513-13b7f9a31fc0/go.mod h1:N1tkhZGMILQsONAY58qi3JhmoA08YpX5np4LoiWu+vs=
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-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
@ -230,5 +234,6 @@ 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/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

2
pkg/cmd/edit/edit_test.go
View File

@ -30,6 +30,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/spf13/cobra"
yaml "go.yaml.in/yaml/v2"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/genericiooptions"
@ -39,7 +40,6 @@ import (
"k8s.io/kubectl/pkg/cmd/create"
cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)
type EditTestCase struct {

2
pkg/cmd/edit/testdata/record.go vendored
View File

@ -25,7 +25,7 @@ import (
"os"
"strings"
yaml "sigs.k8s.io/yaml/goyaml.v2"
yaml "go.yaml.in/yaml/v2"
)
type EditTestCase struct {