.

Author: isabella-janssen

test/extended/machine_config/helpers.go

@@ -703,33 +703,34 @@ func WaitForNodeCurrentConfig(oc *exutil.CLI, nodeName string, config string) {
 	}, 5*time.Minute, 10*time.Second).Should(o.BeTrue(), "Timed out waiting for node '%v' to have a current config version of '%v'.", nodeName, config)
 }
 
-// `GetCordonedNode` returns the cordoned node when the corresponding MCP starts updating
-func GetCordonedNode(oc *exutil.CLI, mcpName string) corev1.Node {
+// `GetUpdatingNode` returns the updating node, determined by the node targetting a new desired
+// config, when the corresponding MCP starts updating
+func GetUpdatingNode(oc *exutil.CLI, mcpName, originalConfigVersion string) corev1.Node {
 	// Wait for the MCP to start updating
 	o.Expect(WaitForMCPConditionStatus(oc, mcpName, mcfgv1.MachineConfigPoolUpdating, corev1.ConditionTrue, 3*time.Minute, 2*time.Second)).NotTo(o.HaveOccurred(), "Waiting for 'Updating' status change failed.")
 
-	// Get first cordoned node & return it
-	var cordonedNode corev1.Node
+	// Get first updating node & return it
+	var updatingNode corev1.Node
 	o.Eventually(func() bool {
-		framework.Logf("Trying to get cordoned node in '%v' MCP.", mcpName)
+		framework.Logf("Trying to get updating node in '%v' MCP.", mcpName)
 
 		// Get nodes in MCP
 		nodes, nodeErr := GetNodesByRole(oc, mcpName)
 		o.Expect(nodeErr).NotTo(o.HaveOccurred(), "Error getting nodes from %v MCP.", mcpName)
 		o.Expect(nodes).ShouldNot(o.BeEmpty(), "No nodes found for %v MCP.", mcpName)
 
-		// Loop through nodes to see which is cordoned
+		// Loop through nodes to see which is targetting a new desired config version
 		for _, node := range nodes {
-			if node.Spec.Unschedulable {
-				cordonedNode = node
+			if node.Annotations[desiredConfigAnnotationKey] != originalConfigVersion {
+				updatingNode = node
 				return true
 			}
 		}
 
 		return false
-	}, 1*time.Minute, 5*time.Second).Should(o.BeTrue())
+	}, 30*time.Second, 1*time.Second).Should(o.BeTrue())
 
-	return cordonedNode
+	return updatingNode
 }
 
 // `WaitForMCPConditionStatus` waits up to the desired timeout for the desired MCP condition to match the desired status (ex. wait until "Updating" is "True")

test/extended/machine_config/machine_config_node.go

@@ -239,6 +239,11 @@ func ValidateMCNConditionTransitionsOnRebootlessUpdateMaster(oc *exutil.CLI, cli
 	poolName := master
 	mcName := fmt.Sprintf("90-%v-testfile", poolName)
 
+	// Get the starting config version
+	mcp, mcpErr := clientSet.MachineconfigurationV1().MachineConfigPools().Get(context.TODO(), poolName, metav1.GetOptions{})
+	o.Expect(mcpErr).NotTo(o.HaveOccurred(), fmt.Sprintf("Could not get MCP '%v'; %v", poolName, mcpErr))
+	startingConfigVersion := mcp.Spec.Configuration.Name
+
 	// Remove node disruption policy on test completion or failure
 	defer func() {
 		// Apply empty MachineConfiguration fixture to remove previously set NodeDisruptionPolicy
@@ -267,7 +272,7 @@ func ValidateMCNConditionTransitionsOnRebootlessUpdateMaster(oc *exutil.CLI, cli
 	o.Expect(mcErr).NotTo(o.HaveOccurred(), "Could not apply MachineConfig.")
 
 	// Get the updating node
-	updatingNode := GetCordonedNode(oc, poolName)
+	updatingNode := GetUpdatingNode(oc, poolName, startingConfigVersion)
 	o.Expect(updatingNode).NotTo(o.BeNil(), "Could not get updating node.")
 	framework.Logf("Node '%v' is updating.", updatingNode.Name)