Handle cluster join as create if we're the only member

Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 36537244) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Handle cluster join as create if we're the only member
5b8f9aba · Brad Davidson · Brad Davidson · 11b9afb1 · 5b8f9aba
Commit 5b8f9aba authored Dec 12, 2024 by Brad Davidson Committed by Brad Davidson Jan 10, 2025
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

etcd.go pkg/etcd/etcd.go +11 -3

No files found.
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -559,6 +559,7 @@ func (e *ETCD) join(ctx context.Context, clientAccessInfo *clientaccess.Info) er
 	defer cancel()
 	var (
+		state   string
 		cluster []string
 		add     = true
 	)
@@ -620,12 +621,19 @@ func (e *ETCD) join(ctx context.Context, clientAccessInfo *clientaccess.Info) er
 			return err
 		}
 		cluster = append(cluster, fmt.Sprintf("%s=%s", e.name, e.peerURL()))
+		state = "existing"
+	} else if len(cluster) > 1 {
+		logrus.Infof("Starting etcd to join cluster with members %v", cluster)
+		state = "existing"
+	} else {
+		logrus.Infof("Starting etcd for new cluster")
+		state = "new"
 	}
-	logrus.Infof("Starting etcd to join cluster with members %v", cluster)
 	return e.cluster(ctx, false, executor.InitialOptions{
-		Cluster: strings.Join(cluster, ","),
+		AdvertisePeerURL: e.peerURL(),
-		State:   "existing",
+		Cluster:          strings.Join(cluster, ","),
+		State:            state,
 	})
 }