[release-5.0] OCPBUGS-111703: Fix tnf_cluster_in_service during per-node maintenance

[openshift-cherrypick-robot]

This is an automated cherry-pick of #1678

/assign lucaconsalvi

[openshift-merge-bot]

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: ec744443-30cd-4d6b-bf13-987ff00ec451

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

_{Comment @coderabbitai help to get the list of available commands.}

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign eggfoobar for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• pkg/tnf/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-109740 has been cloned as Jira Issue OCPBUGS-111703. Will retitle bug to link to clone.
/retitle [release-5.0] OCPBUGS-111703: Fix tnf_cluster_in_service during per-node maintenance

Details

In response to this:

This is an automated cherry-pick of #1678

/assign lucaconsalvi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-111703, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #1678

/assign lucaconsalvi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[lucaconsalvi]

/jira refresh

[openshift-ci-robot]

@lucaconsalvi: This pull request references Jira Issue OCPBUGS-111703, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (5.0.0) matches configured target version for branch (5.0.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-109740 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-109740 targets the "5.1.0" version, which is one of the valid target versions: 5.1.0
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (dhensel@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[dhensel-rh]

/lgtm

[openshift-merge-bot]

Scheduling required tests:
/test e2e-agnostic-ovn
/test e2e-agnostic-ovn-upgrade
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-ovn-single-node
/test e2e-gcp-operator
/test e2e-gcp-operator-disruptive
/test e2e-metal-ipi-ovn-ipv6
/test e2e-operator

[lucaconsalvi]

Verification

Tested on a 5.0 cluster built from nightly 5.0.0-0.nightly-2026-08-11-014409 with this PR applied (cluster-bot build).

Cluster version reported: 5.0.0-0-2026-08-18-162945-test-ci-ln-xshyh3k-latest

Steps:

1. Confirmed healthy 2-node TNF cluster (master-0, master-1)
2. Confirmed baseline: tnf_cluster_in_service=1, both tnf_node_in_service=1
3. Put all nodes in maintenance individually: pcs node maintenance --all
4. Verified both nodes show as maintenance in pcs status:

   Node master-0: maintenance
   Node master-1: maintenance
   

5. Waited ~90s for status collector to update
6. Queried Prometheus:

tnf_cluster_in_service = 0   ✅ (was incorrectly 1 before this fix)
tnf_node_in_service{master-0} = 0
tnf_node_in_service{master-1} = 0

Result: tnf_cluster_in_service correctly reports 0 when all nodes are placed in maintenance individually via --all, which previously only iterated per-node without setting the cluster-level maintenance property.

/verified by @lucaconsalvi

[openshift-ci-robot]

@lucaconsalvi: This PR has been marked as verified by @lucaconsalvi.

Details

In response to this:

Verification

Tested on a 5.0 cluster built from nightly 5.0.0-0.nightly-2026-08-11-014409 with this PR applied (cluster-bot build).

Cluster version reported: 5.0.0-0-2026-08-18-162945-test-ci-ln-xshyh3k-latest

Steps:

1. Confirmed healthy 2-node TNF cluster (master-0, master-1)
2. Confirmed baseline: tnf_cluster_in_service=1, both tnf_node_in_service=1
3. Put all nodes in maintenance individually: pcs node maintenance --all
4. Verified both nodes show as maintenance in pcs status:

Node master-0: maintenance
Node master-1: maintenance

5. Waited ~90s for status collector to update
6. Queried Prometheus:

tnf_cluster_in_service = 0   ✅ (was incorrectly 1 before this fix)
tnf_node_in_service{master-0} = 0
tnf_node_in_service{master-1} = 0

Result: tnf_cluster_in_service correctly reports 0 when all nodes are placed in maintenance individually via --all, which previously only iterated per-node without setting the cluster-level maintenance property.

/verified by @lucaconsalvi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[lucaconsalvi]

/retest

[lucaconsalvi]

/retest

[lucaconsalvi]

/retest

[lucaconsalvi]

/retest

[lucaconsalvi]

/test e2e-gcp-operator

[openshift-ci]

@openshift-cherrypick-robot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-gcp-operator	f9b9248	link	true	/test e2e-gcp-operator

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.