diff --git a/go.mod b/go.mod index c83b51083..89e7a5174 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/emicklei/go-restful v2.9.3+incompatible // indirect github.com/evanphx/json-patch v3.0.0+incompatible - github.com/ghodss/yaml v1.0.0 + github.com/ghodss/yaml v1.0.0 // indirect github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa // indirect github.com/go-openapi/jsonreference v0.0.0-20180322222742-3fb327e6747d // indirect github.com/go-openapi/spec v0.0.0-20180415031709-bcff419492ee @@ -35,4 +35,5 @@ require ( k8s.io/apimachinery v0.0.0-20180510061931-13b73596e4b6 k8s.io/client-go v7.0.0+incompatible k8s.io/kube-openapi v0.0.0-20180510204742-b3f03f553288 + sigs.k8s.io/yaml v1.1.0 ) diff --git a/go.sum b/go.sum index a12faa59e..85a9911b2 100644 --- a/go.sum +++ b/go.sum @@ -86,3 +86,5 @@ k8s.io/client-go v7.0.0+incompatible h1:kiH+Y6hn+pc78QS/mtBfMJAMIIaWevHi++JvOGEE k8s.io/client-go v7.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= k8s.io/kube-openapi v0.0.0-20180510204742-b3f03f553288 h1:AhFqcaw5JbAAaZHxTe1fT+Jtek0pZmIwwt6FbsMA9to= k8s.io/kube-openapi v0.0.0-20180510204742-b3f03f553288/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= +sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/pkg/commands/build/build.go b/pkg/commands/build/build.go index df65ff137..05fcd2896 100644 --- a/pkg/commands/build/build.go +++ b/pkg/commands/build/build.go @@ -22,7 +22,6 @@ import ( "path/filepath" "strings" - "github.com/ghodss/yaml" "github.com/pkg/errors" "github.com/spf13/cobra" "sigs.k8s.io/kustomize/pkg/fs" @@ -32,6 +31,7 @@ import ( "sigs.k8s.io/kustomize/pkg/plugins" "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/target" + "sigs.k8s.io/yaml" ) // Options contain the options for running a build diff --git a/pkg/commands/kustfile/kustomizationfile.go b/pkg/commands/kustfile/kustomizationfile.go index 15a200d46..b06e37024 100644 --- a/pkg/commands/kustfile/kustomizationfile.go +++ b/pkg/commands/kustfile/kustomizationfile.go @@ -26,10 +26,10 @@ import ( "regexp" "strings" - "github.com/ghodss/yaml" "sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/pgmconfig" "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/yaml" ) var fieldMarshallingOrder = determineFieldOrder() diff --git a/pkg/patch/transformer/patchjson6902json.go b/pkg/patch/transformer/patchjson6902json.go index 1f09939d1..d4d6c0abb 100644 --- a/pkg/patch/transformer/patchjson6902json.go +++ b/pkg/patch/transformer/patchjson6902json.go @@ -20,12 +20,12 @@ import ( "fmt" "github.com/evanphx/json-patch" - "github.com/ghodss/yaml" "github.com/pkg/errors" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resource" "sigs.k8s.io/kustomize/pkg/transformers" + "sigs.k8s.io/yaml" ) // patchJson6902JSONTransformer applies patches. diff --git a/pkg/plugins/execplugin.go b/pkg/plugins/execplugin.go index c08653db5..604757715 100644 --- a/pkg/plugins/execplugin.go +++ b/pkg/plugins/execplugin.go @@ -26,10 +26,10 @@ import ( "strings" "syscall" - "github.com/ghodss/yaml" "sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" + "sigs.k8s.io/yaml" ) const ( diff --git a/pkg/resmap/resmap.go b/pkg/resmap/resmap.go index ca1e72398..b8ddc09f4 100644 --- a/pkg/resmap/resmap.go +++ b/pkg/resmap/resmap.go @@ -23,10 +23,10 @@ import ( "reflect" "sort" - "github.com/ghodss/yaml" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resource" "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/yaml" ) // ResMap is a map from ResId to Resource. diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index 8d9bdb956..b7a5b6641 100644 --- a/pkg/target/kusttarget.go +++ b/pkg/target/kusttarget.go @@ -23,7 +23,6 @@ import ( "fmt" "strings" - "github.com/ghodss/yaml" "github.com/pkg/errors" "sigs.k8s.io/kustomize/pkg/accumulator" "sigs.k8s.io/kustomize/pkg/ifc" @@ -36,6 +35,7 @@ import ( "sigs.k8s.io/kustomize/pkg/transformers" "sigs.k8s.io/kustomize/pkg/transformers/config" "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/yaml" ) // KustTarget encapsulates the entirety of a kustomization build. diff --git a/pkg/transformers/config/factory.go b/pkg/transformers/config/factory.go index d0ea0d1dd..e46407822 100644 --- a/pkg/transformers/config/factory.go +++ b/pkg/transformers/config/factory.go @@ -19,8 +19,8 @@ package config import ( "log" - "github.com/ghodss/yaml" "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/yaml" ) // Factory makes instances of TransformerConfig. diff --git a/pkg/transformers/config/factorycrd.go b/pkg/transformers/config/factorycrd.go index 66a24dc86..e5e26541d 100644 --- a/pkg/transformers/config/factorycrd.go +++ b/pkg/transformers/config/factorycrd.go @@ -20,12 +20,12 @@ import ( "encoding/json" "strings" - "github.com/ghodss/yaml" "github.com/go-openapi/spec" "github.com/pkg/errors" "k8s.io/kube-openapi/pkg/common" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/yaml" ) type myProperties map[string]spec.Schema