From 3770a7cb9fd84ed3b35f462657189f3d6a512897 Mon Sep 17 00:00:00 2001 From: Michael Pruitt Date: Tue, 4 Aug 2026 11:56:27 -0500 Subject: [PATCH 1/2] Fix missing OperatorGroup for rhacs-operator and odf-operator in OPP 4.22 upgrade The install-operators step only creates an OperatorGroup when the operator_group field is present in the OPERATORS JSON. Without it, OLM cannot process the Subscription and the CSV is never installed, causing a timeout after 30 retries. Adds operator_group to both rhacs-operator and odf-operator entries in the 4.22 upgrade config. --- .../stolostron-policy-collection-main__ocp4.22-upgrade.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml index a8e4a9187d0b1..a359943aadd97 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml @@ -57,8 +57,8 @@ tests: OPERATORS: | [ {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.16", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}, - {"name": "rhacs-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "rhacs-operator", "target_namespaces": "rhacs-operator"}, - {"name": "odf-operator", "source": "redhat-operators", "channel": "stable-4.21", "install_namespace": "openshift-storage", "target_namespaces": "openshift-storage"}, + {"name": "rhacs-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "rhacs-operator", "target_namespaces": "rhacs-operator", "operator_group": "rhacs-operator-group"}, + {"name": "odf-operator", "source": "redhat-operators", "channel": "stable-4.21", "install_namespace": "openshift-storage", "target_namespaces": "openshift-storage", "operator_group": "openshift-storage-operator-group"}, {"name": "quay-operator", "source": "redhat-operators", "channel": "stable-3.17", "install_namespace": "openshift-operators"} ] ZONES_COUNT: "3" From cc49dbf33141b66ad341600e0720ec5c11add1fa Mon Sep 17 00:00:00 2001 From: Anthony Pruitt Date: Wed, 5 Aug 2026 12:13:46 -0500 Subject: [PATCH 2/2] fix: use AllNamespaces OperatorGroup for rhacs-operator ACS v4.11+ only supports AllNamespaces install mode. Removing target_namespaces causes install-operators to create an OperatorGroup without spec.targetNamespaces (AllNamespaces mode). --- .../stolostron-policy-collection-main__ocp4.22-upgrade.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml index a359943aadd97..95de1310e9408 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml @@ -57,7 +57,7 @@ tests: OPERATORS: | [ {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.16", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}, - {"name": "rhacs-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "rhacs-operator", "target_namespaces": "rhacs-operator", "operator_group": "rhacs-operator-group"}, + {"name": "rhacs-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "rhacs-operator", "operator_group": "rhacs-operator-group"}, {"name": "odf-operator", "source": "redhat-operators", "channel": "stable-4.21", "install_namespace": "openshift-storage", "target_namespaces": "openshift-storage", "operator_group": "openshift-storage-operator-group"}, {"name": "quay-operator", "source": "redhat-operators", "channel": "stable-3.17", "install_namespace": "openshift-operators"} ]