Add comment and small fix

Signed-off-by: nasusoba <[email protected]> slightly fixed the comment Signed-off-by: nasusoba <[email protected]>
k3s-io · May 6, 2024 · 18e434b · 18e434b
1 parent c05fb3f
commit 18e434b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/k3s/workload_cluster_etcd.go b/pkg/k3s/workload_cluster_etcd.go
@@ -77,6 +77,10 @@ func (w *Workload) reconcileEtcdMember(ctx context.Context, nodeNames []string,
 loopmembers:
 	for _, member := range members {
 		curNodeName := etcdutil.NodeNameFromMember(member)
+		// If this member is just added, it has a empty name until the etcd starts. Ignore it.
+		if curNodeName == "" {
+			continue
+		}
 
 		for _, nodeName := range nodeNames {
 			if curNodeName == nodeName {
@@ -95,7 +99,7 @@ loopmembers:
 	return removedMembers, errs
 }
 
-// RemoveEtcdMemberForMachine removes the etcd member from the target cluster's etcd cluster.
+// RemoveEtcdMemberForMachine removes the etcd member from the target cluster's etcd cluster, and returns true if the member has been removed.
 // Removing the last remaining member of the cluster is not supported.
 func (w *Workload) RemoveEtcdMemberForMachine(ctx context.Context, machine *clusterv1.Machine) (bool, error) {
 	if machine == nil || machine.Status.NodeRef == nil {

diff --git a/test/e2e/node_scale_test.go b/test/e2e/node_scale_test.go
@@ -168,7 +168,7 @@ var _ = Describe("Workload cluster scaling", func() {
 					Namespace:                namespace.Name,
 					ClusterName:              clusterName,
 					KubernetesVersion:        e2eConfig.GetVariable(KubernetesVersion),
-					ControlPlaneMachineCount: pointer.Int64Ptr(3), // TODO: change to 1 after scaling down control planes working
+					ControlPlaneMachineCount: pointer.Int64Ptr(1),
 					WorkerMachineCount:       pointer.Int64Ptr(1),
 				},
 				WaitForClusterIntervals:      e2eConfig.GetIntervals(specName, "wait-cluster"),