Skip to content

[release-4.22] OCPBUGS-111831: tolerate one NotReady CP node in EnsureNodesReady for degraded TNF #31527

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
Aug 19, 2026
+9 −0
Merged

[release-4.22] OCPBUGS-111831: tolerate one NotReady CP node in EnsureNodesReady for degraded TNF #31527

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
9 changes: 9 additions & 0 deletions test/extended/node/node_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,15 @@ func GetNotReadyNodes(ctx context.Context, oc *exutil.CLI) ([]string, error) {
func EnsureNodesReady(ctx context.Context, oc *exutil.CLI) {
notReadyNodes, err := GetNotReadyNodes(ctx, oc)
o.Expect(err).NotTo(o.HaveOccurred(), "failed to check node readiness")

// On intentionally degraded TNF clusters (DEGRADED_NODE=true), one control-plane
// node is expected to be shut down. Tolerate exactly one NotReady node so tests
// can run against the surviving single-node cluster.
if exutil.ClusterDegraded && len(notReadyNodes) == 1 && exutil.IsTwoNodeFencing(ctx, oc.AdminConfigClient()) {
framework.Logf("Tolerating one NotReady node %v on intentionally degraded TNF cluster", notReadyNodes)
notReadyNodes = nil
}

o.Expect(notReadyNodes).To(o.BeEmpty(),
"Cannot start test: nodes not Ready: %v. Cluster may be recovering from previous test.", notReadyNodes)
}