Pārlūkot izejas kodu

Merge pull request #3847 from gyuho/doc_flag_issue3690

etcdmain: more description for init cluster token
Xiang Li 10 gadi atpakaļ
vecāks
revīzija
434f39d813
2 mainītis faili ar 3 papildinājumiem un 0 dzēšanām
  1. 2 0
      etcdmain/config.go
  2. 1 0
      etcdmain/help.go

+ 2 - 0
etcdmain/config.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
 
 
+// Every change should be reflected on help.go as well.
+
 package etcdmain
 package etcdmain
 
 
 import (
 import (

+ 1 - 0
etcdmain/help.go

@@ -57,6 +57,7 @@ clustering flags:
 		initial cluster state ('new' or 'existing').
 		initial cluster state ('new' or 'existing').
 	--initial-cluster-token 'etcd-cluster'
 	--initial-cluster-token 'etcd-cluster'
 		initial cluster token for the etcd cluster during bootstrap.
 		initial cluster token for the etcd cluster during bootstrap.
+		Specifying this can protect you from unintended cross-cluster interaction when running multiple clusters.
 	--advertise-client-urls 'http://localhost:2379,http://localhost:4001'
 	--advertise-client-urls 'http://localhost:2379,http://localhost:4001'
 		list of this member's client URLs to advertise to the public.
 		list of this member's client URLs to advertise to the public.
 		The client URLs advertised should be accessible to machines that talk to etcd cluster. etcd client libraries parse these URLs to connect to the cluster.
 		The client URLs advertised should be accessible to machines that talk to etcd cluster. etcd client libraries parse these URLs to connect to the cluster.