diff --git a/kyaml/go.mod b/kyaml/go.mod index d5f040200..d60788ff8 100644 --- a/kyaml/go.mod +++ b/kyaml/go.mod @@ -16,8 +16,8 @@ require ( github.com/stretchr/testify v1.5.1 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 gopkg.in/yaml.v2 v2.4.0 - gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e ) diff --git a/kyaml/go.sum b/kyaml/go.sum index 6d1920b01..ab2613f86 100644 --- a/kyaml/go.sum +++ b/kyaml/go.sum @@ -218,7 +218,6 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= diff --git a/kyaml/setters2/set.go b/kyaml/setters2/set.go index 9ac229c83..a6095ca63 100644 --- a/kyaml/setters2/set.go +++ b/kyaml/setters2/set.go @@ -8,12 +8,12 @@ import ( "strings" "text/template" - goyaml "gopkg.in/yaml.v3" "k8s.io/kube-openapi/pkg/validation/spec" "k8s.io/kube-openapi/pkg/validation/strfmt" "k8s.io/kube-openapi/pkg/validation/validate" "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/fieldmeta" + goyaml "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/kio/kioutil" "sigs.k8s.io/kustomize/kyaml/openapi" diff --git a/kyaml/yaml/alias.go b/kyaml/yaml/alias.go index 342b6df73..56cd2c64c 100644 --- a/kyaml/yaml/alias.go +++ b/kyaml/yaml/alias.go @@ -7,7 +7,7 @@ import ( "bytes" "io" - "gopkg.in/yaml.v3" + "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" ) // Expose the yaml.v3 functions so this package can be used as a replacement diff --git a/kyaml/yaml/compatibility.go b/kyaml/yaml/compatibility.go index 77b0f6db0..1adc5c008 100644 --- a/kyaml/yaml/compatibility.go +++ b/kyaml/yaml/compatibility.go @@ -8,8 +8,8 @@ import ( "strings" y1_1 "gopkg.in/yaml.v2" - y1_2 "gopkg.in/yaml.v3" "k8s.io/kube-openapi/pkg/validation/spec" + y1_2 "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" ) // typeToTag maps OpenAPI schema types to yaml 1.2 tags diff --git a/kyaml/yaml/fns.go b/kyaml/yaml/fns.go index ab01b9815..5289997dd 100644 --- a/kyaml/yaml/fns.go +++ b/kyaml/yaml/fns.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/davecgh/go-spew/spew" - "gopkg.in/yaml.v3" "sigs.k8s.io/kustomize/kyaml/errors" + "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" ) // Append creates an ElementAppender diff --git a/kyaml/yaml/fns_test.go b/kyaml/yaml/fns_test.go index a4e5db98f..3c7377877 100644 --- a/kyaml/yaml/fns_test.go +++ b/kyaml/yaml/fns_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v3" + "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" . "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/kyaml/yaml/kfns.go b/kyaml/yaml/kfns.go index d9e5dfaf6..2ae8c1665 100644 --- a/kyaml/yaml/kfns.go +++ b/kyaml/yaml/kfns.go @@ -4,8 +4,8 @@ package yaml import ( - "gopkg.in/yaml.v3" "sigs.k8s.io/kustomize/kyaml/errors" + "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" ) // AnnotationClearer removes an annotation at metadata.annotations. diff --git a/kyaml/yaml/rnode.go b/kyaml/yaml/rnode.go index e0678a7eb..f7e3f230c 100644 --- a/kyaml/yaml/rnode.go +++ b/kyaml/yaml/rnode.go @@ -12,8 +12,8 @@ import ( "strconv" "strings" - "gopkg.in/yaml.v3" "sigs.k8s.io/kustomize/kyaml/errors" + "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" "sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/labels" ) diff --git a/kyaml/yaml/rnode_test.go b/kyaml/yaml/rnode_test.go index 12843a99e..3cce6f0ac 100644 --- a/kyaml/yaml/rnode_test.go +++ b/kyaml/yaml/rnode_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" + "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" ) func TestRNodeHasNilEntryInList(t *testing.T) { diff --git a/kyaml/yaml/serialization.go b/kyaml/yaml/serialization.go index 9f2c6a3e4..26f15d386 100644 --- a/kyaml/yaml/serialization.go +++ b/kyaml/yaml/serialization.go @@ -3,7 +3,7 @@ package yaml -import "gopkg.in/yaml.v3" +import "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" func DoSerializationHacksOnNodes(nodes []*RNode) { for _, node := range nodes { diff --git a/kyaml/yaml/types.go b/kyaml/yaml/types.go index 81def6c87..c4e06a578 100644 --- a/kyaml/yaml/types.go +++ b/kyaml/yaml/types.go @@ -7,8 +7,8 @@ import ( "bytes" "strings" - "gopkg.in/yaml.v3" "sigs.k8s.io/kustomize/kyaml/errors" + "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml" "sigs.k8s.io/kustomize/kyaml/sets" )