check that node & MCN delete

Author: isabella-janssen

test/extended/machine_config/helpers.go

@@ -728,24 +728,6 @@ func getNodeInMachine(oc *exutil.CLI, machineName string) (corev1.Node, error) {
 		return corev1.Node{}, fmt.Errorf("more than one node is linked to Machine: %s; number of nodes: %d", machineName, numberOfNodeNames)
 	}
 
-	// // Get the node object
-	// nodes, nodesErr := oc.AsAdmin().KubeClient().CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
-	// if nodesErr != nil { //error getting nodes
-	// 	return corev1.Node{}, nodesErr
-	// } else if len(nodes.Items) == 0 { //no nodes retrieved
-	// 	return corev1.Node{}, fmt.Errorf("could not retreive nodes")
-	// }
-
-	// framework.Logf("nodeNames: %v", nodeNames)
-	// framework.Logf("nodeNames: %v", strings.ReplaceAll(nodeNames, "'", ""))
-	// framework.Logf("nodeNames: %T", nodeNames)
-	// // Loop through nodes to get desired one
-	// for _, node := range nodes.Items {
-	// 	if node.Name == nodeNames {
-	// 		return node, nil
-	// 	}
-	// }
-
 	node, nodeErr := oc.AsAdmin().KubeClient().CoreV1().Nodes().Get(context.TODO(), strings.ReplaceAll(nodeNames, "'", ""), metav1.GetOptions{})
 	if nodeErr != nil { //error getting filtered node names
 		return corev1.Node{}, nodeErr
@@ -870,3 +852,39 @@ func WaitForValidMCNProperties(clientSet *machineconfigclient.Clientset, node co
 	}, 2*time.Minute, 5*time.Second).Should(o.BeTrue())
 	return nil
 }
+
+// `WaitForNodeToBeDeleted` waits for a node to no longer exist
+func WaitForNodeToBeDeleted(oc *exutil.CLI, nodeName string) error {
+	o.Eventually(func() bool {
+		framework.Logf("Check if node %v is deleted.", nodeName)
+
+		// Check if node still exists
+		node, _ := oc.AsAdmin().KubeClient().CoreV1().Nodes().Get(context.TODO(), nodeName, metav1.GetOptions{})
+		if node == nil {
+			framework.Logf("Node %v has been deleted.", nodeName)
+			return true
+		}
+
+		framework.Logf("Node %v still exists.", nodeName)
+		return false
+	}, 7*time.Minute, 3*time.Second).Should(o.BeTrue())
+	return nil
+}
+
+// `WaitForMCNToBeDeleted` waits for a MCN to no longer exist
+func WaitForMCNToBeDeleted(clientSet *machineconfigclient.Clientset, mcnName string) error {
+	o.Eventually(func() bool {
+		framework.Logf("Check if MCN %v is deleted.", mcnName)
+
+		// Check if MCN still exists
+		mcn, _ := clientSet.MachineconfigurationV1alpha1().MachineConfigNodes().Get(context.TODO(), mcnName, metav1.GetOptions{})
+		if mcn == nil {
+			framework.Logf("MCN %v has been deleted.", mcnName)
+			return true
+		}
+
+		framework.Logf("MCN %v still exists.", mcnName)
+		return false
+	}, 4*time.Minute, 3*time.Second).Should(o.BeTrue())
+	return nil
+}

test/extended/machine_config/machine_config_node.go

@@ -276,22 +276,6 @@ func ValidateMCNConditionOnNodeDegrade(oc *exutil.CLI, fixture string) {
 // and deleted on node deletion
 // TODO: figure out if this needs to be a long test due to the time it takes to provision a machine & create a node
 func ValidateMCNOnNodeCreationAndDeletion(oc *exutil.CLI) {
-	// // nodes, _ := oc.AsAdmin().KubeClient().CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
-	// // framework.Logf("node name %v", nodes.Items[0].Name)
-	// // framework.Logf("node annotations %v", nodes.Items[0].Annotations)
-
-	// node := getRandomNode(oc, worker)
-	// nodeMCP := ""
-	// framework.Logf("node.Labels: %v", node.Labels)
-	// for _, label := range node.Labels {
-	// 	framework.Logf("label: %v", label)
-	// 	if strings.Contains(label, "node-role.kubernetes.io/") {
-	// 		nodeMCP = strings.ReplaceAll(strings.ReplaceAll(label, "node-role.kubernetes.io/", ""), "=", "")
-	// 		break
-	// 	}
-	// }
-	// framework.Logf("nodeMCP: %v", nodeMCP)
-
 	// Create machine client for test
 	machineClient, machineErr := machineclient.NewForConfig(oc.KubeFramework().ClientConfig())
 	o.Expect(machineErr).NotTo(o.HaveOccurred())
@@ -341,7 +325,23 @@ func ValidateMCNOnNodeCreationAndDeletion(oc *exutil.CLI) {
 	validMCNErr := WaitForValidMCNProperties(clientSet, node)
 	o.Expect(validMCNErr).NotTo(o.HaveOccurred())
 
-	// Scale down new MachineSet
-	// Check that node DNE
-	// Check that MCN DNE
+	// Scale down the MachineSet to delete the created node
+	framework.Logf("Scaling down MachineSet to delete node.")
+	scaleErr = ScaleMachineSet(oc, machineSet.Name, fmt.Sprintf("%d", originalReplica))
+	o.Expect(scaleErr).NotTo(o.HaveOccurred(), fmt.Sprintf("Error deleting node by scaling MachineSet %v to replica value %v.", machineSet.Name, string(originalReplica)))
+
+	// Get the deleting node
+	framework.Logf("Getting the deleting machine.")
+	deletingMachine, deletingMachineErr := GetMachinesByPhase(machineClient, machineSet.Name, "Deleting")
+	o.Expect(deletingMachineErr).NotTo(o.HaveOccurred(), fmt.Sprintf("Cannot find deleting machine in MachineSet %v", machineSet.Name))
+	deletingMachineName := deletingMachine.Name
+	framework.Logf("Machine %v is being deleted.", deletingMachineName)
+	framework.Logf("Getting node in deleting machine %v.", deletingMachineName)
+	deletingNode, deletingNodeErr := getNodeInMachine(oc, deletingMachineName)
+	o.Expect(deletingNodeErr).NotTo(o.HaveOccurred())
+	framework.Logf("Node being deleted: %v.", deletingNode.Name)
+
+	// Check that node & MCN are removed
+	o.Expect(WaitForNodeToBeDeleted(oc, deletingNode.Name))
+	o.Expect(WaitForMCNToBeDeleted(clientSet, deletingNode.Name))
 }