Skip to content

OCPQE-31553: update preflight permission case #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 1, 2026
Merged

OCPQE-31553: update preflight permission case #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openshift/tests-extension/pkg/bindata/qe/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions openshift/tests-extension/test/qe/specs/olmv1_ce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...ft/tests-extension/test/qe/testdata/olm/sa-nginx-insufficient-operand-rbac-boxcutter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion openshift/tests-extension/test/qe/testdata/olm/sa-nginx-limited-boxcutter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down