diff --git a/clientv3/yaml/config.go b/clientv3/yaml/config.go index 35bd84fb53c9..dc3e246e277a 100644 --- a/clientv3/yaml/config.go +++ b/clientv3/yaml/config.go @@ -20,7 +20,7 @@ import ( "crypto/x509" "io/ioutil" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/pkg/tlsutil" diff --git a/clientv3/yaml/config_test.go b/clientv3/yaml/config_test.go index bcf28b434570..7a8f71280ac2 100644 --- a/clientv3/yaml/config_test.go +++ b/clientv3/yaml/config_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" ) var ( diff --git a/embed/config.go b/embed/config.go index 95189e186c0c..a7cdfd13c8c3 100644 --- a/embed/config.go +++ b/embed/config.go @@ -27,6 +27,8 @@ import ( "sync" "time" + "sigs.k8s.io/yaml" + "go.etcd.io/etcd/etcdserver" "go.etcd.io/etcd/etcdserver/api/v3compactor" "go.etcd.io/etcd/pkg/flags" @@ -36,7 +38,6 @@ import ( "go.etcd.io/etcd/pkg/transport" "go.etcd.io/etcd/pkg/types" - "github.com/ghodss/yaml" bolt "go.etcd.io/bbolt" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/embed/config_test.go b/embed/config_test.go index 091375892214..e5077ec39f4e 100644 --- a/embed/config_test.go +++ b/embed/config_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/pkg/transport" + "sigs.k8s.io/yaml" - "github.com/ghodss/yaml" + "go.etcd.io/etcd/pkg/transport" ) func TestConfigFileOtherFields(t *testing.T) { diff --git a/etcdmain/config.go b/etcdmain/config.go index e06d642c7e6e..f74e863dee6d 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -26,12 +26,13 @@ import ( "runtime" "strings" + "sigs.k8s.io/yaml" + "go.etcd.io/etcd/embed" "go.etcd.io/etcd/pkg/flags" "go.etcd.io/etcd/pkg/types" "go.etcd.io/etcd/version" - "github.com/ghodss/yaml" "go.uber.org/zap" ) diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go index 6c01184bee1f..f68ae34eadd4 100644 --- a/etcdmain/config_test.go +++ b/etcdmain/config_test.go @@ -23,7 +23,8 @@ import ( "strings" "testing" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" + "go.etcd.io/etcd/embed" ) diff --git a/go.mod b/go.mod index 80d042fcc4e1..a84c2c121478 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 github.com/fatih/color v1.7.0 // indirect - github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 github.com/gogo/protobuf v1.0.0 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 @@ -60,4 +59,5 @@ require ( gopkg.in/cheggaaa/pb.v1 v1.0.25 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect gopkg.in/yaml.v2 v2.2.2 + sigs.k8s.io/yaml v1.1.0 ) diff --git a/go.sum b/go.sum index 270c485cf627..312d050418ac 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,6 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= -github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= github.com/gogo/protobuf v1.0.0 h1:2jyBKDKU/8v3v2xVR2PtiWQviFUyiaGk2rpfyFT8rTM= github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= @@ -135,3 +133,5 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=