Merge branch 'refactor/add-node' into 'master'

tonic · tonic · commit 80b7e56f5189 · 2017-06-16T07:49:03.000Z
注册 node 的时候允许覆盖

See merge request !99
diff --git a/store/etcd/node.go b/store/etcd/node.go
@@ -95,9 +95,6 @@ func (k *krypton) AddNode(name, endpoint, podname, cafile, certfile, keyfile str
 	}
 
 	key := fmt.Sprintf(nodeInfoKey, podname, name)
-	if _, err := k.etcd.Get(context.Background(), key, nil); err == nil {
-		return nil, fmt.Errorf("Node (%s, %s) already exists", podname, name)
-	}
 
 	// 如果有tls的证书需要保存就保存一下
 	if cafile != "" && certfile != "" && keyfile != "" {

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,6 @@ func (k *krypton) AddNode(name, endpoint, podname, cafile, certfile, keyfile str`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`key := fmt.Sprintf(nodeInfoKey, podname, name)`
`98`		`- if _, err := k.etcd.Get(context.Background(), key, nil); err == nil {`
`99`		`- return nil, fmt.Errorf("Node (%s, %s) already exists", podname, name)`
`100`		`- }`
`101`	`98`
`102`	`99`	`// 如果有tls的证书需要保存就保存一下`
`103`	`100`	`if cafile != "" && certfile != "" && keyfile != "" {`