installer: rename the role name witness instead etcd

Signed-off-by: Vicente Cheng <[email protected]>
harvester · Jan 10, 2024 · 4f47e27 · 4f47e27
1 parent c3aab22
commit 4f47e27
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/pkg/config/constants.go b/pkg/config/constants.go
@@ -7,7 +7,7 @@ const (
 	ModeInstall = "install"
 
 	RoleDefault = "default"
-	RoleEtcd    = "etcd"
+	RoleWitness = "witness"
 
 	NetworkMethodDHCP   = "dhcp"
 	NetworkMethodStatic = "static"

diff --git a/pkg/console/install_panels.go b/pkg/console/install_panels.go
@@ -770,8 +770,8 @@ func addAskRolePanel(c *Console) error {
 				Value: config.RoleDefault,
 				Text:  "Default Role (Master or Worker)",
 			}, {
-				Value: config.RoleEtcd,
-				Text:  "Worker (Etcd only)",
+				Value: config.RoleWitness,
+				Text:  "Witness Role",
 			},
 		}, nil
 	}

diff --git a/pkg/console/util.go b/pkg/console/util.go
@@ -457,11 +457,11 @@ func doInstall(g *gocui.Gui, hvstConfig *config.HarvesterConfig, webhooks Render
 	}
 
 	// specific the node label for the specific node role
-	if hvstConfig.Role == config.RoleEtcd {
+	if hvstConfig.Role == config.RoleWitness {
 		if hvstConfig.Labels == nil {
 			hvstConfig.Labels = make(map[string]string)
 		}
-		hvstConfig.Labels[util.HarvesterEtcdNodeLabelKey] = "true"
+		hvstConfig.Labels[util.HarvesterWitnessNodeLabelKey] = "true"
 	}
 
 	env, elementalConfig, err := generateEnvAndConfig(g, hvstConfig)
@@ -777,11 +777,11 @@ func configureInstalledNode(g *gocui.Gui, hvstConfig *config.HarvesterConfig, we
 	webhooks.Handle(EventInstallStarted)
 
 	// specific the node label for the specific node role
-	if hvstConfig.Role == config.RoleEtcd {
+	if hvstConfig.Role == config.RoleWitness {
 		if hvstConfig.Labels == nil {
 			hvstConfig.Labels = make(map[string]string)
 		}
-		hvstConfig.Labels[util.HarvesterEtcdNodeLabelKey] = "true"
+		hvstConfig.Labels[util.HarvesterWitnessNodeLabelKey] = "true"
 	}
 
 	// skip rancherd and network config in the cos config

diff --git a/pkg/util/common.go b/pkg/util/common.go
@@ -6,7 +6,7 @@ import (
 
 var (
 	HarvesterNodeRoleLabelPrefix = "node-role.harvesterhci.io/"
-	HarvesterEtcdNodeLabelKey    = HarvesterNodeRoleLabelPrefix + "etcd"
+	HarvesterWitnessNodeLabelKey = HarvesterNodeRoleLabelPrefix + "witness"
 
 	sizeRegexp = regexp.MustCompile(`^(\d+)(Mi|Gi)$`)
 )