Skip to content

NO-ISSUE: Make MCN degrade test stable across TechPreview and non-TechPreview #30943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Mar 27, 2026
Merged

NO-ISSUE: Make MCN degrade test stable across TechPreview and non-TechPreview #30943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions test/extended/machine_config/machine_config_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,16 +434,21 @@ func ValidateMCNConditionOnNodeDegrade(oc *exutil.CLI, fixture string, isSno boo
degradedNode, degradedNodeErr := GetDegradedNode(oc, poolName)
o.Expect(degradedNodeErr).NotTo(o.HaveOccurred(), "Could not get degraded node.")

unknownCondition := mcfgv1.MachineConfigNodeUpdateFilesAndOS
if isFeatureGateEnabled(oc.AdminConfigClient(), "ImageModeStatusReporting") {
unknownCondition = mcfgv1.MachineConfigNodeUpdateFiles
}

// Validate MCN of degraded node
// get and log MCN conditions for debugging purposes
degradedNodeMCN, degradedErr = clientSet.MachineconfigurationV1().MachineConfigNodes().Get(context.TODO(), degradedNode.Name, metav1.GetOptions{})
o.Expect(degradedErr).NotTo(o.HaveOccurred(), fmt.Sprintf("Error getting MCN of degraded node '%v'.", degradedNode.Name))
nodeDegradedCondition := GetMCNCondition(degradedNodeMCN, mcfgv1.MachineConfigNodeNodeDegraded)
o.Expect(nodeDegradedCondition).NotTo(o.BeNil(), "Condition 'NodeDegraded' does not exist.")
framework.Logf("`NodeDegraded` condition status is `%v` with the message `%v`", nodeDegradedCondition.Status, nodeDegradedCondition.Message)
fileCondition := GetMCNCondition(degradedNodeMCN, mcfgv1.MachineConfigNodeUpdateFiles)
o.Expect(fileCondition).NotTo(o.BeNil(), "Condition 'AppliedFiles' does not exist.")
framework.Logf("`AppliedFiles` condition status is `%v` with the message `%v`", fileCondition.Status, fileCondition.Message)
fileCondition := GetMCNCondition(degradedNodeMCN, unknownCondition)
o.Expect(fileCondition).NotTo(o.BeNil(), "Condition '%v' does not exist.", unknownCondition)
framework.Logf("`%v` condition status is `%v` with the message `%v`", unknownCondition, fileCondition.Status, fileCondition.Message)
executedCondition := GetMCNCondition(degradedNodeMCN, mcfgv1.MachineConfigNodeUpdateExecuted)
o.Expect(executedCondition).NotTo(o.BeNil(), "Condition 'UpdateExecuted' does not exist.")
framework.Logf("`UpdateExecuted` condition status is `%v` with the message `%v`", executedCondition.Status, executedCondition.Message)
Expand All @@ -454,8 +459,8 @@ func ValidateMCNConditionOnNodeDegrade(oc *exutil.CLI, fixture string, isSno boo
o.Expect(nodeDegradedCondition.Message).Should(o.ContainSubstring("/home/core: file exists"), "Condition 'NodeDegraded' does not have the expected message details.")
framework.Logf("Validating that `UpdateExecuted` condition in '%v' MCN has a status of 'Unknown'.", degradedNodeMCN.Name)
o.Expect(executedCondition.Status).Should(o.Equal(metav1.ConditionUnknown), "Condition 'UpdateExecuted' does not have the expected status of 'Unknown'.")
framework.Logf("Validating that `AppliedFilesAndOS` condition in '%v' MCN has a status of 'Unknown'.", degradedNodeMCN.Name)
o.Expect(fileCondition.Status).Should(o.Equal(metav1.ConditionUnknown), "Condition 'AppliedFilesAndOS' does not have the expected status of 'Unknown'.")
framework.Logf("Validating that `%v` condition in '%v' MCN has a status of 'Unknown'.", unknownCondition, degradedNodeMCN.Name)
o.Expect(fileCondition.Status).Should(o.Equal(metav1.ConditionUnknown), "Condition '%v' does not have the expected status of 'Unknown'.", unknownCondition)
}

// `ValidateMCNProperties` checks that MCNs with correct properties are created on node creation
Expand Down