Merge pull request #3 from jianxiaoguo/master

chore(pkg): upgrade go.mod (k8s api;etcd clientv3) fix conflict

Author: duanhongyi

go.mod

@@ -5,25 +5,21 @@ go 1.13
 require (
 	github.com/Masterminds/cookoo v1.3.0
 	github.com/arschles/assert v1.0.1-0.20191213221312-71f210f9375a
-	github.com/coreos/etcd v2.3.8+incompatible
-	github.com/gogo/protobuf v1.3.1 // indirect
+	github.com/coreos/etcd v3.3.22+incompatible
+	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
+	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/golang/protobuf v1.4.2 // indirect
-	github.com/google/btree v1.0.0 // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/googleapis/gnostic v0.2.2 // indirect; indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/json-iterator/go v1.1.10 // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	go.uber.org/zap v1.15.0 // indirect
 	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
-	golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3
+	golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
 	golang.org/x/text v0.3.3 // indirect
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	k8s.io/api v0.0.0-20181221193117-173ce66c1e39
-	k8s.io/apimachinery v0.0.0-20190119020841-d41becfba9ee
-	k8s.io/client-go v10.0.0+incompatible
-	k8s.io/klog v1.0.0 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
-    github.com/googleapis/gnostic v0.2.2 //indirect
+	k8s.io/api v0.18.6
+	k8s.io/apimachinery v0.18.6
+	k8s.io/client-go v0.18.6
 )