From c7659af406824acb01dc0fb4dcf3fc6fceaf24c2 Mon Sep 17 00:00:00 2001 From: sharathsivakumar Date: Tue, 25 Apr 2023 08:02:39 +0200 Subject: [PATCH] server: backport 15743, improved description of --initial-cluster-state flag Signed-off-by: sharathsivakumar --- server/etcdmain/config.go | 2 +- server/etcdmain/help.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/etcdmain/config.go b/server/etcdmain/config.go index d8460af88b2..34b5a4cc899 100644 --- a/server/etcdmain/config.go +++ b/server/etcdmain/config.go @@ -202,7 +202,7 @@ func newConfig() *config { fs.StringVar(&cfg.ec.DNSClusterServiceName, "discovery-srv-name", cfg.ec.DNSClusterServiceName, "Service name to query when using DNS discovery.") fs.StringVar(&cfg.ec.InitialCluster, "initial-cluster", cfg.ec.InitialCluster, "Initial cluster configuration for bootstrapping.") fs.StringVar(&cfg.ec.InitialClusterToken, "initial-cluster-token", cfg.ec.InitialClusterToken, "Initial cluster token for the etcd cluster during bootstrap.") - fs.Var(cfg.cf.clusterState, "initial-cluster-state", "Initial cluster state ('new' or 'existing').") + fs.Var(cfg.cf.clusterState, "initial-cluster-state", "Initial cluster state ('new' when bootstrapping a new cluster or 'existing' when adding new members to an existing cluster). After successful initialization (bootstrapping or adding), flag is ignored on restarts.") fs.BoolVar(&cfg.ec.StrictReconfigCheck, "strict-reconfig-check", cfg.ec.StrictReconfigCheck, "Reject reconfiguration requests that would cause quorum loss.") diff --git a/server/etcdmain/help.go b/server/etcdmain/help.go index fdb55d887b0..6880847c8f4 100644 --- a/server/etcdmain/help.go +++ b/server/etcdmain/help.go @@ -101,7 +101,8 @@ Clustering: --initial-cluster 'default=http://localhost:2380' Initial cluster configuration for bootstrapping. --initial-cluster-state 'new' - Initial cluster state ('new' or 'existing'). + Initial cluster state ('new' when bootstrapping a new cluster or 'existing' when adding new members to an existing cluster). + After successful initialization (bootstrapping or adding), flag is ignored on restarts. --initial-cluster-token 'etcd-cluster' Initial cluster token for the etcd cluster during bootstrap. Specifying this can protect you from unintended cross-cluster interaction when running multiple clusters.