From 91e3816cad568d20e41367addec249d53109eab5 Mon Sep 17 00:00:00 2001
From: ehila <ehila@redhat.com>
Date: Thu, 21 May 2026 00:51:00 -0400
Subject: [PATCH] upkeep: add exception for expected disruption during tnf
 upgrade

Signed-off-by: ehila <ehila@redhat.com>
---
 .../legacycvomonitortests/operators.go              | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go b/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go
index d291d3776c82..92f464362368 100644
--- a/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go
+++ b/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go
@@ -339,6 +339,10 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf
 			if checkAuthenticationAvailableExceptions(condition) {
 				return "https://issues.redhat.com/browse/OCPBUGS-20056"
 			}
+			if isTwoNode && condition.Type == configv1.OperatorDegraded && condition.Status == configv1.ConditionTrue &&
+				strings.Contains(condition.Reason, "OAuthServerDeployment_UnavailablePod") {
+				return "authentication may report Degraded while oauth-openshift pods roll out during DualReplica disruptive upgrades"
+			}
 		case "cloud-controller-manager":
 			if condition.Type == configv1.OperatorDegraded && condition.Status == configv1.ConditionTrue && condition.Reason == "SyncingFailed" {
 				return "https://issues.redhat.com/browse/OCPBUGS-42837"
@@ -377,6 +381,11 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf
 					return "https://issues.redhat.com/browse/OCPBUGS-23746"
 				}
 			}
+		case "openshift-controller-manager":
+			if isTwoNode && condition.Type == configv1.OperatorAvailable && condition.Status == configv1.ConditionFalse &&
+				condition.Reason == "_NoPodsAvailable" {
+				return "openshift-controller-manager may report Available=False with _NoPodsAvailable while controller-manager pods are redeployed during DualReplica disruptive upgrades"
+			}
 		case "openshift-samples":
 			if isTwoNode {
 				if condition.Type == configv1.OperatorAvailable && condition.Status == configv1.ConditionFalse &&
@@ -736,8 +745,8 @@ func testUpgradeOperatorProgressingStateTransitions(events monitorapi.Intervals,
 	except = func(co string, reason string) string {
 		switch co {
 		case "authentication":
-			if isTwoNode && reason == "APIServerDeployment_NewGeneration" {
-				return "authentication operator may roll oauth-apiserver (APIServerDeployment_NewGeneration) during DualReplica upgrades while machine-config is progressing"
+			if isTwoNode && (reason == "APIServerDeployment_NewGeneration" || reason == "APIServerDeployment_PodsUpdating") {
+				return "authentication operator may roll oauth-apiserver (APIServerDeployment_NewGeneration or APIServerDeployment_PodsUpdating) during DualReplica upgrades while machine-config is progressing"
 			}
 		case "etcd":
 			if isTwoNode {