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

Merge pull request #127901 from skitt/k8s-sigs-yaml 

Use sigs.k8s.io/yaml instead of gopkg.in/yaml

Kubernetes-commit: dd87bc064631354885193fc1a97d0e7b603e77b4
This commit is contained in:
Kubernetes Publisher 2024-10-09 19:38:29 +01:00
parent 2bb291358c 0f462824c7
commit 7ed2361d8a
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
go.mod
View File

@ -30,12 +30,11 @@ require (
github.com/stretchr/testify v1.9.0
golang.org/x/sys v0.23.0
gopkg.in/evanphx/json-patch.v4 v4.12.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20241007141734-f2b3dfac9f9a
k8s.io/apimachinery v0.0.0-20241008174842-acfda137309f
k8s.io/cli-runtime v0.0.0-20240929085927-151bd347501c
k8s.io/client-go v0.0.0-20241009015600-ba20fcad8ff5
k8s.io/component-base v0.0.0-20241001220445-c0cd2c6692d9
k8s.io/cli-runtime v0.0.0-20241009225106-60610a1a50bf
k8s.io/client-go v0.0.0-20241009095550-cae730524e69
k8s.io/component-base v0.0.0-20241009221110-e1bff02fe65d
k8s.io/component-helpers v0.0.0-20240928083404-d763e5df641d
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2
@ -93,8 +92,9 @@ require (
golang.org/x/tools v0.24.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/kustomize/api v0.17.2 // indirect
)
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20241005062217-b5f416725ab3
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20241009220734-fa8be78a95ed

12
go.sum
View File

@ -280,12 +280,12 @@ k8s.io/api v0.0.0-20241007141734-f2b3dfac9f9a h1:8q3QPAbWPx++17jOoJM531vGG++BaX6
k8s.io/api v0.0.0-20241007141734-f2b3dfac9f9a/go.mod h1:4imq7dQloEla0ISqR4MeHpt7KNQ/IbLuRQM6skmjopE=
k8s.io/apimachinery v0.0.0-20241008174842-acfda137309f h1:H2ZYi+KurPHzI6h2BZo8c/jMt9Qj450Hrhkxz4u24X4=
k8s.io/apimachinery v0.0.0-20241008174842-acfda137309f/go.mod h1:5rKPDwwN9qm//xASFCZ83nyYEanHxxhc7pZ8AC4lukY=
k8s.io/cli-runtime v0.0.0-20240929085927-151bd347501c h1:7+9k1S+WDy+y/xHDRU5quCw7LfnEQU6LA7VJsm6w6bY=
k8s.io/cli-runtime v0.0.0-20240929085927-151bd347501c/go.mod h1:du1kfwxSQN6iGi5MBcSlEjnGCihu36g2N44Q5X4kuco=
k8s.io/client-go v0.0.0-20241009015600-ba20fcad8ff5 h1:0286SQ9Ipg/R8WdFX9kLcSr+HgJFkd2ndG26z5JHyks=
k8s.io/client-go v0.0.0-20241009015600-ba20fcad8ff5/go.mod h1:cqj1iwFRFp6UFcFPzZSPn8kxgd7DeSz9FN6X6POzxRY=
k8s.io/component-base v0.0.0-20241001220445-c0cd2c6692d9 h1:YOGfOCOBUkWcMT0S3OIcR6/BgJ/ovoROwILYayHtzmg=
k8s.io/component-base v0.0.0-20241001220445-c0cd2c6692d9/go.mod h1:SXR+31cb9E1AxfWOBNWvFyNme4DqmNCTjS0fMt/09Bs=
k8s.io/cli-runtime v0.0.0-20241009225106-60610a1a50bf h1:/RsjdeOXlgZIqrLLRDB9bU0HqC8usht1Omz4PKU2K2E=
k8s.io/cli-runtime v0.0.0-20241009225106-60610a1a50bf/go.mod h1:B6SWUYxvjV9P53ZR9pGY3F/rPWUfxLti+w2B+eHgXm8=
k8s.io/client-go v0.0.0-20241009095550-cae730524e69 h1:sBH8mG6aqvRGrRgArCK8MOr1LmY8eLuZnuLqOPubwXo=
k8s.io/client-go v0.0.0-20241009095550-cae730524e69/go.mod h1:cqj1iwFRFp6UFcFPzZSPn8kxgd7DeSz9FN6X6POzxRY=
k8s.io/component-base v0.0.0-20241009221110-e1bff02fe65d h1:7B68Nad2bss97q05CAyQH12jn2UO49d9ZeaRAiaqsP4=
k8s.io/component-base v0.0.0-20241009221110-e1bff02fe65d/go.mod h1:alVRbVHuFbdMncSRtej6BtF/cUzBeUwKbUz9zshZa7I=
k8s.io/component-helpers v0.0.0-20240928083404-d763e5df641d h1:Tw+xa+jU6X73uZhtzAoj4wmbKssmcsDiaQNcFBfgJPI=
k8s.io/component-helpers v0.0.0-20240928083404-d763e5df641d/go.mod h1:/gg6Mvn3qY9XUOia0hHgqqy9vDWMJi8KmadhnsHNy6k=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

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

@ -30,8 +30,6 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/spf13/cobra"
yaml "gopkg.in/yaml.v2"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/genericiooptions"
@ -41,6 +39,7 @@ 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 "gopkg.in/yaml.v2"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)
type EditTestCase struct {