Skip to content

Commit 3297c37

Browse files
camilamacedo86camilamacedo86
committed
UPSTREAM: <carry>: Rename ClusterExtensionRevision to ClusterObjectSet in OTE tests
Update all remaining references to ClusterExtensionRevision in openshift/tests-extension to use ClusterObjectSet, matching the upstream rename in operator-framework/operator-controller#2589. Files updated: - test/qe/specs/olmv1_ce.go: RBAC resource names and comments - test/olmv1-preflight.go: scenario constants, test names, RBAC rules - .openshift-tests-extension/openshift_payload_olmv1.json: test name - pkg/bindata/qe/bindata.go: embedded RBAC templates - test/qe/testdata/olm/sa-nginx-limited-boxcutter.yaml: RBAC resources - test/qe/testdata/olm/sa-nginx-insufficient-operand-rbac-boxcutter.yaml: RBAC resources Signed-off-by: Camila Macedo <cmacedo@redhat.com> Made-with: Cursor
1 parent a267dba commit 3297c37

6 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1528,7 +1528,7 @@
15281528
"environmentSelector": {}
15291529
},
15301530
{
1531-
"name": "[sig-olmv1][OCPFeatureGate:NewOLMPreflightPermissionChecks][Skipped:Disconnected] OLMv1 operator preflight checks should report error when {clusterextensionrevisions/finalizer} is not specified",
1531+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMPreflightPermissionChecks][Skipped:Disconnected] OLMv1 operator preflight checks should report error when {clusterobjectsets/finalizer} is not specified",
15321532
"labels": {},
15331533
"resources": {
15341534
"isolation": {}

‎openshift/tests-extension/pkg/bindata/qe/bindata.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openshift/tests-extension/test/olmv1-preflight.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const (
3636
scenarioMissingNamedConfigMapPerms preflightAuthTestScenario = 3
3737
scenarioMissingClusterExtensionsFinalizerPerms preflightAuthTestScenario = 4
3838
scenarioMissingEscalateAndBindPerms preflightAuthTestScenario = 5
39-
scenarioMissingClusterExtensionRevisionsFinalizerPerms preflightAuthTestScenario = 6
39+
scenarioMissingClusterObjectSetsFinalizerPerms preflightAuthTestScenario = 6
4040
)
4141

4242
const preflightBundleVersion = "0.0.5"
@@ -107,9 +107,9 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMPreflightPermissionChecks][Sk
107107
runNegativePreflightTest(ctx, scenarioMissingClusterExtensionsFinalizerPerms, namespace, packageName, catalogName)
108108
})
109109

110-
It("should report error when {clusterextensionrevisions/finalizer} is not specified", func(ctx SpecContext) {
110+
It("should report error when {clusterobjectsets/finalizer} is not specified", func(ctx SpecContext) {
111111
helpers.RequireFeatureGateEnabled(features.FeatureGateNewOLMBoxCutterRuntime)
112-
runNegativePreflightTest(ctx, scenarioMissingClusterExtensionRevisionsFinalizerPerms, namespace, packageName, catalogName)
112+
runNegativePreflightTest(ctx, scenarioMissingClusterObjectSetsFinalizerPerms, namespace, packageName, catalogName)
113113
})
114114

115115
It("should report error when {escalate, bind} is not specified", func(ctx SpecContext) {
@@ -185,7 +185,7 @@ func createDeficientClusterRole(scenario preflightAuthTestScenario, name, ceName
185185
baseRules = []rbacv1.PolicyRule{
186186
{
187187
APIGroups: []string{"olm.operatorframework.io"},
188-
Resources: []string{"clusterextensionrevisions/finalizers"},
188+
Resources: []string{"clusterobjectsets/finalizers"},
189189
Verbs: []string{"update"},
190190
ResourceNames: []string{ceName},
191191
},
@@ -293,8 +293,8 @@ func createDeficientClusterRole(scenario preflightAuthTestScenario, name, ceName
293293
}
294294
}
295295
rules = filtered
296-
case scenarioMissingClusterExtensionRevisionsFinalizerPerms:
297-
// Remove permission for clusterextensionrevisions/finalizers so preflight fails.
296+
case scenarioMissingClusterObjectSetsFinalizerPerms:
297+
// Remove permission for clusterobjectsets/finalizers so preflight fails.
298298
filtered := []rbacv1.PolicyRule{}
299299
for _, r := range rules {
300300
if len(r.APIGroups) != 1 || r.APIGroups[0] != "olm.operatorframework.io" {

‎openshift/tests-extension/test/qe/specs/olmv1_ce.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
534534
baseDir = exutil.FixturePath("testdata", "olm")
535535
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
536536
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
537-
// Select template based on runtime: Boxcutter needs clusterextensionrevisions/finalizers, Helm needs clusterextensions/finalizers
537+
// Select template based on runtime: Boxcutter needs clusterobjectsets/finalizers, Helm needs clusterextensions/finalizers
538538
saTemplate string
539539
)
540540
if olmv1util.IsFeaturegateEnabled(oc, "NewOLMBoxCutterRuntime") {
@@ -683,10 +683,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
683683
`Namespace:"ns-81538" APIGroups:[] Resources:[services] ResourceNames:[nginx-ok-v81538-controller-manager-metrics-service] Verbs:[delete,get,patch,update]`, 3, 150, 0)
684684
// Check finalizers permission based on Boxcutter runtime feature gate
685685
if olmv1util.IsFeaturegateEnabled(oc, "NewOLMBoxCutterRuntime") {
686-
// Env3: Boxcutter with preflight - expects clusterextensionrevisions/finalizers
687-
// Note: In Boxcutter, the ResourceName is the ClusterExtensionRevision name (ce-81538-1 for first revision)
686+
// Env3: Boxcutter with preflight - expects clusterobjectsets/finalizers
687+
// Note: In Boxcutter, the ResourceName is the ClusterObjectSet name (ce-81538-1 for first revision)
688688
ce.CheckClusterExtensionCondition(oc, "Progressing", "message",
689-
`Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterextensionrevisions/finalizers] ResourceNames:[ce-81538-1] Verbs:[update]`, 3, 150, 0)
689+
`Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterobjectsets/finalizers] ResourceNames:[ce-81538-1] Verbs:[update]`, 3, 150, 0)
690690
} else {
691691
// Env2: Helm with preflight - expects clusterextensions/finalizers
692692
ce.CheckClusterExtensionCondition(oc, "Progressing", "message",
@@ -793,10 +793,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
793793
`Namespace:"ns-81664" APIGroups:[] Resources:[services] ResourceNames:[nginx-ok-v81664-controller-manager-metrics-service] Verbs:[delete,get,patch,update]`, 3, 150, 0)
794794
// Check finalizers permission based on Boxcutter runtime feature gate
795795
if olmv1util.IsFeaturegateEnabled(oc, "NewOLMBoxCutterRuntime") {
796-
// Env3: Boxcutter with preflight - expects clusterextensionrevisions/finalizers
797-
// Note: In Boxcutter, the ResourceName is the ClusterExtensionRevision name (ce-81664-1 for first revision)
796+
// Env3: Boxcutter with preflight - expects clusterobjectsets/finalizers
797+
// Note: In Boxcutter, the ResourceName is the ClusterObjectSet name (ce-81664-1 for first revision)
798798
ce.CheckClusterExtensionCondition(oc, "Progressing", "message",
799-
`Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterextensionrevisions/finalizers] ResourceNames:[ce-81664-1] Verbs:[update]`, 3, 150, 0)
799+
`Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterobjectsets/finalizers] ResourceNames:[ce-81664-1] Verbs:[update]`, 3, 150, 0)
800800
} else {
801801
// Env2: Helm with preflight - expects clusterextensions/finalizers
802802
ce.CheckClusterExtensionCondition(oc, "Progressing", "message",
@@ -922,10 +922,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
922922
`Namespace:"ns-81696" APIGroups:[] Resources:[services] ResourceNames:[nginx-ok-v81696-controller-manager-metrics-service] Verbs:[delete,get,patch,update]`, 3, 150, 0)
923923
// Check finalizers permission based on Boxcutter runtime feature gate
924924
if olmv1util.IsFeaturegateEnabled(oc, "NewOLMBoxCutterRuntime") {
925-
// Env3: Boxcutter with preflight - expects clusterextensionrevisions/finalizers
926-
// Note: In Boxcutter, the ResourceName is the ClusterExtensionRevision name (ce-81696-1 for first revision)
925+
// Env3: Boxcutter with preflight - expects clusterobjectsets/finalizers
926+
// Note: In Boxcutter, the ResourceName is the ClusterObjectSet name (ce-81696-1 for first revision)
927927
ce.CheckClusterExtensionCondition(oc, "Progressing", "message",
928-
`Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterextensionrevisions/finalizers] ResourceNames:[ce-81696-1] Verbs:[update]`, 3, 150, 0)
928+
`Namespace:"" APIGroups:[olm.operatorframework.io] Resources:[clusterobjectsets/finalizers] ResourceNames:[ce-81696-1] Verbs:[update]`, 3, 150, 0)
929929
} else {
930930
// Env2: Helm with preflight - expects clusterextensions/finalizers
931931
ce.CheckClusterExtensionCondition(oc, "Progressing", "message",

‎openshift/tests-extension/test/qe/testdata/olm/sa-nginx-insufficient-operand-rbac-boxcutter.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ objects:
1414
name: "${NAME}-installer-clusterrole"
1515
rules:
1616
- apiGroups: [olm.operatorframework.io]
17-
resources: [clusterextensionrevisions/finalizers]
17+
resources: [clusterobjectsets/finalizers]
1818
verbs: [update]
1919
- apiGroups: [apiextensions.k8s.io]
2020
resources: [customresourcedefinitions]

‎openshift/tests-extension/test/qe/testdata/olm/sa-nginx-limited-boxcutter.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ objects:
1414
name: "${NAME}-installer-clusterrole"
1515
rules:
1616
- apiGroups: [olm.operatorframework.io]
17-
resources: [clusterextensionrevisions/finalizers]
17+
resources: [clusterobjectsets/finalizers]
1818
verbs: [update]
1919
- apiGroups: [apiextensions.k8s.io]
2020
resources: [customresourcedefinitions]

0 commit comments

Comments
 (0)