Skip to content

Commit 3ded19e

Browse files
Merge pull request #30325 from hongkailiu/revert-aca74c4009a1e252f37e8b563ead0bbb6b61c1ad
Revert "Revert "NO-JIRA: Add olm into the known operator set""
2 parents af977aa + 558fc12 commit 3ded19e

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

pkg/monitortestlibrary/platformidentification/operator_mapping.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ var (
111111
"monitoring",
112112
"network",
113113
"node-tuning",
114+
"olm",
114115
"openshift-apiserver",
115116
"openshift-controller-manager",
116117
"openshift-samples",
@@ -154,6 +155,7 @@ func init() {
154155
utilruntime.Must(addOperatorMapping("monitoring", "Monitoring"))
155156
utilruntime.Must(addOperatorMapping("network", "Networking"))
156157
utilruntime.Must(addOperatorMapping("node-tuning", "Node Tuning Operator"))
158+
utilruntime.Must(addOperatorMapping("olm", "OLM"))
157159
utilruntime.Must(addOperatorMapping("openshift-apiserver", "openshift-apiserver"))
158160
utilruntime.Must(addOperatorMapping("openshift-controller-manager", "openshift-controller-manager"))
159161
utilruntime.Must(addOperatorMapping("openshift-samples", "Samples"))

pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,13 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf
401401
if condition.Type == configv1.OperatorDegraded && condition.Status == configv1.ConditionTrue {
402402
return "https://issues.redhat.com/browse/OCPBUGS-39026", nil
403403
}
404+
case "olm":
405+
if condition.Type == configv1.OperatorAvailable &&
406+
condition.Status == configv1.ConditionFalse &&
407+
(condition.Reason == "OperatorcontrollerDeploymentOperatorControllerControllerManager_Deploying" ||
408+
condition.Reason == "CatalogdDeploymentCatalogdControllerManager_Deploying") {
409+
return "https://issues.redhat.com/browse/OCPBUGS-62517", nil
410+
}
404411
case "openshift-apiserver":
405412
if condition.Type == configv1.OperatorAvailable && condition.Status == configv1.ConditionFalse &&
406413
(condition.Reason == "APIServerDeployment_NoDeployment" ||

0 commit comments

Comments
 (0)