From ebab83b8cd5e42c26d8a1478b740f867df9a009c Mon Sep 17 00:00:00 2001 From: Kui Wang Date: Tue, 31 Mar 2026 11:40:08 +0800 Subject: [PATCH] UPSTREAM: : Update finalizers to clusterobjectsets --- .../tests-extension/pkg/bindata/qe/bindata.go | 4 ++-- .../tests-extension/test/qe/specs/olmv1_ce.go | 20 +++++++++---------- ...x-insufficient-operand-rbac-boxcutter.yaml | 2 +- .../olm/sa-nginx-limited-boxcutter.yaml | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/openshift/tests-extension/pkg/bindata/qe/bindata.go b/openshift/tests-extension/pkg/bindata/qe/bindata.go index 796b2743aa..f57893af57 100644 --- a/openshift/tests-extension/pkg/bindata/qe/bindata.go +++ b/openshift/tests-extension/pkg/bindata/qe/bindata.go @@ -2436,7 +2436,7 @@ objects: name: "${NAME}-installer-clusterrole" rules: - apiGroups: [olm.operatorframework.io] - resources: [clusterextensionrevisions/finalizers] + resources: [clusterobjectsets/finalizers] verbs: [update] - apiGroups: [apiextensions.k8s.io] resources: [customresourcedefinitions] @@ -2846,7 +2846,7 @@ objects: name: "${NAME}-installer-clusterrole" rules: - apiGroups: [olm.operatorframework.io] - resources: [clusterextensionrevisions/finalizers] + resources: [clusterobjectsets/finalizers] verbs: [update] - apiGroups: [apiextensions.k8s.io] resources: [customresourcedefinitions] diff --git a/openshift/tests-extension/test/qe/specs/olmv1_ce.go b/openshift/tests-extension/test/qe/specs/olmv1_ce.go index 1823088d4f..f4706a19e0 100644 --- a/openshift/tests-extension/test/qe/specs/olmv1_ce.go +++ b/openshift/tests-extension/test/qe/specs/olmv1_ce.go @@ -534,7 +534,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh baseDir = exutil.FixturePath("testdata", "olm") clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml") clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml") - // Select template based on runtime: Boxcutter needs clusterextensionrevisions/finalizers, Helm needs clusterextensions/finalizers + // Select template based on runtime: Boxcutter needs clusterobjectsets/finalizers, Helm needs clusterextensions/finalizers saTemplate string ) if olmv1util.IsFeaturegateEnabled(oc, "NewOLMBoxCutterRuntime") { @@ -683,10 +683,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh `Namespace:"ns-81538" APIGroups:[] Resources:[services] ResourceNames:[nginx-ok-v81538-controller-manager-metrics-service] Verbs:[delete,get,patch,update]`, 3, 150, 0) // Check finalizers permission based on Boxcutter runtime feature gate if olmv1util.IsFeaturegateEnabled(oc, "NewOLMBoxCutterRuntime") { - // Env3: Boxcutter with preflight - expects clusterextensionrevisions/finalizers - // Note: In Boxcutter, the ResourceName is the ClusterExtensionRevision name (ce-81538-1 for first revision) + // Env3: Boxcutter with preflight - expects clusterobjectsets/finalizers + // Note: In Boxcutter, the ResourceName is the ClusterObjectSet name (ce-81538-1 for first revision) ce.CheckClusterExtensionCondition(oc, "Progressing", "message", - `Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterextensionrevisions/finalizers] ResourceNames:[ce-81538-1] Verbs:[update]`, 3, 150, 0) + `Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterobjectsets/finalizers] ResourceNames:[ce-81538-1] Verbs:[update]`, 3, 150, 0) } else { // Env2: Helm with preflight - expects clusterextensions/finalizers ce.CheckClusterExtensionCondition(oc, "Progressing", "message", @@ -793,10 +793,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh `Namespace:"ns-81664" APIGroups:[] Resources:[services] ResourceNames:[nginx-ok-v81664-controller-manager-metrics-service] Verbs:[delete,get,patch,update]`, 3, 150, 0) // Check finalizers permission based on Boxcutter runtime feature gate if olmv1util.IsFeaturegateEnabled(oc, "NewOLMBoxCutterRuntime") { - // Env3: Boxcutter with preflight - expects clusterextensionrevisions/finalizers - // Note: In Boxcutter, the ResourceName is the ClusterExtensionRevision name (ce-81664-1 for first revision) + // Env3: Boxcutter with preflight - expects clusterobjectsets/finalizers + // Note: In Boxcutter, the ResourceName is the ClusterObjectSet name (ce-81664-1 for first revision) ce.CheckClusterExtensionCondition(oc, "Progressing", "message", - `Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterextensionrevisions/finalizers] ResourceNames:[ce-81664-1] Verbs:[update]`, 3, 150, 0) + `Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterobjectsets/finalizers] ResourceNames:[ce-81664-1] Verbs:[update]`, 3, 150, 0) } else { // Env2: Helm with preflight - expects clusterextensions/finalizers ce.CheckClusterExtensionCondition(oc, "Progressing", "message", @@ -922,10 +922,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh `Namespace:"ns-81696" APIGroups:[] Resources:[services] ResourceNames:[nginx-ok-v81696-controller-manager-metrics-service] Verbs:[delete,get,patch,update]`, 3, 150, 0) // Check finalizers permission based on Boxcutter runtime feature gate if olmv1util.IsFeaturegateEnabled(oc, "NewOLMBoxCutterRuntime") { - // Env3: Boxcutter with preflight - expects clusterextensionrevisions/finalizers - // Note: In Boxcutter, the ResourceName is the ClusterExtensionRevision name (ce-81696-1 for first revision) + // Env3: Boxcutter with preflight - expects clusterobjectsets/finalizers + // Note: In Boxcutter, the ResourceName is the ClusterObjectSet name (ce-81696-1 for first revision) ce.CheckClusterExtensionCondition(oc, "Progressing", "message", - `Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterextensionrevisions/finalizers] ResourceNames:[ce-81696-1] Verbs:[update]`, 3, 150, 0) + `Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterobjectsets/finalizers] ResourceNames:[ce-81696-1] Verbs:[update]`, 3, 150, 0) } else { // Env2: Helm with preflight - expects clusterextensions/finalizers ce.CheckClusterExtensionCondition(oc, "Progressing", "message", diff --git a/openshift/tests-extension/test/qe/testdata/olm/sa-nginx-insufficient-operand-rbac-boxcutter.yaml b/openshift/tests-extension/test/qe/testdata/olm/sa-nginx-insufficient-operand-rbac-boxcutter.yaml index 8b6e520009..1521d43480 100644 --- a/openshift/tests-extension/test/qe/testdata/olm/sa-nginx-insufficient-operand-rbac-boxcutter.yaml +++ b/openshift/tests-extension/test/qe/testdata/olm/sa-nginx-insufficient-operand-rbac-boxcutter.yaml @@ -14,7 +14,7 @@ objects: name: "${NAME}-installer-clusterrole" rules: - apiGroups: [olm.operatorframework.io] - resources: [clusterextensionrevisions/finalizers] + resources: [clusterobjectsets/finalizers] verbs: [update] - apiGroups: [apiextensions.k8s.io] resources: [customresourcedefinitions] diff --git a/openshift/tests-extension/test/qe/testdata/olm/sa-nginx-limited-boxcutter.yaml b/openshift/tests-extension/test/qe/testdata/olm/sa-nginx-limited-boxcutter.yaml index f8b1170948..0d16d5382e 100644 --- a/openshift/tests-extension/test/qe/testdata/olm/sa-nginx-limited-boxcutter.yaml +++ b/openshift/tests-extension/test/qe/testdata/olm/sa-nginx-limited-boxcutter.yaml @@ -14,7 +14,7 @@ objects: name: "${NAME}-installer-clusterrole" rules: - apiGroups: [olm.operatorframework.io] - resources: [clusterextensionrevisions/finalizers] + resources: [clusterobjectsets/finalizers] verbs: [update] - apiGroups: [apiextensions.k8s.io] resources: [customresourcedefinitions]