update various deps for compatibility

glide.yaml

@@ -2,7 +2,7 @@ package: github.com/m3db/m3ctl
 
 import:
 - package: github.com/m3db/m3cluster
-  version: 4b25af16e37d029b79bae754d35655e6be382f94
+  version: 53fc512c11e1ed03db2d65dac4c139a3c2ff2eda
 - package: github.com/m3db/m3metrics
   version: e1e762432dff17898f0b888751b613ac7db85f61
 - package: github.com/m3db/m3x
@@ -12,9 +12,9 @@ import:
 - package: github.com/beorn7/perks
   version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
 - package: github.com/coreos/etcd
-  version: 8ba2897a21e4fc51b298ca553d251318425f93ae
+  version: 3.2.10
 - package: google.golang.org/grpc
-  version: 777daa17ff9b5daef1cfdf915088a2ada3332bf0
+  version: 1.7.3
 - package: gopkg.in/validator.v2
   version: 3e4f037f12a1221a0864cf0dd2e81c452ab22448
 - package: gopkg.in/yaml.v2
@@ -26,9 +26,9 @@ import:
 - package: github.com/go-ole/go-ole
   version: de8695c8edbf8236f30d6e1376e20b198a028d42
 - package: github.com/golang/mock
-  version: bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
+  version: ^1
 - package: github.com/golang/protobuf
-  version: 7390af9dcd3c33042ebaf2474a1724a83cf1a7e6
+  version: 5a0f697c9ed9d68fef0116532c6e05cfeae00e55
 - package: github.com/grpc-ecosystem/go-grpc-prometheus
   version: 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
 - package: github.com/grpc-ecosystem/grpc-gateway
@@ -54,7 +54,7 @@ import:
 - package: github.com/uber-go/tally
   version: <4.0.0
 - package: golang.org/x/net
-  version: f2499483f923065a842d38eb4c7f1927e6fc6e6d
+  version: ab5485076ff3407ad2d02db054635913f017b0ed
 - package: github.com/gorilla/mux
   version: 18fca31550181693b3a834a15b74b564b3605876
 - package: github.com/go-playground/locales
@@ -70,4 +70,3 @@ testImport:
   version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
 - package: github.com/davecgh/go-spew
   version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
-

services/r2ctl/config/r2ctl.go

@@ -87,7 +87,7 @@ type kvStoreConfig struct {
 	KVClient *etcd.Configuration `yaml:"kvClient" validate:"nonzero"`
 
 	// KV configuration for the rules store.
-	KVConfig clusterkv.Configuration `yaml:"kvConfig"`
+	KVConfig clusterkv.OverrideConfiguration `yaml:"kvConfig"`
 
 	// NamespacesKey is KV key associated with namespaces..
 	NamespacesKey string `yaml:"namespacesKey" validate:"nonzero"`
@@ -109,7 +109,7 @@ func (c kvStoreConfig) NewStore(instrumentOpts instrument.Options) (r2.Store, er
 	if err != nil {
 		return nil, err
 	}
-	kvOpts, err := c.KVConfig.NewOptions()
+	kvOpts, err := c.KVConfig.NewOverrideOptions()
 	if err != nil {
 		return nil, err
 	}