Skip to content

🌱 Consolidate SA e2e steps and formats #2614

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

🌱 Consolidate SA e2e steps and formats #2614

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 test/e2e/features/install.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Feature: Install ClusterExtension
Background:
Given OLM is available
And ClusterCatalog "test" serves bundles
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
And ServiceAccount "olm-sa" with needed permissions is available in test namespace

Comment thread
perdasilva marked this conversation as resolved.
Scenario: Install latest available version
When ClusterExtension is applied
Expand Down Expand Up @@ -594,7 +594,7 @@ Feature: Install ClusterExtension
@BoxcutterRuntime
@PreflightPermissions
Scenario: Boxcutter preflight check detects missing CREATE permissions
Given ServiceAccount "olm-sa" without create permissions is available in ${TEST_NAMESPACE}
Given ServiceAccount "olm-sa" without create permissions is available in test namespace
And ClusterExtension is applied
"""
apiVersion: olm.operatorframework.io/v1
Comment thread
perdasilva marked this conversation as resolved.
Expand Down
14 changes: 7 additions & 7 deletions test/e2e/features/recover.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
And ClusterCatalog "test" serves bundles

Scenario: Restore removed resource
Given ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
And ClusterExtension is applied
"""
apiVersion: olm.operatorframework.io/v1
Expand Down Expand Up @@ -49,12 +49,12 @@ Feature: Recover cluster extension from errors that might occur during its lifet
"olm.operatorframework.io/metadata.name": test-catalog
"""
And ClusterExtension reports Progressing as True with Reason Retrying
When ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
Then ClusterExtension is available
And ClusterExtension reports Progressing as True with Reason Succeeded

Scenario: Install ClusterExtension after conflicting resource is removed
Given ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
And resource is applied
"""
apiVersion: apps/v1
Expand Down Expand Up @@ -118,7 +118,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
@PreflightPermissions
Scenario: ClusterExtension installation succeeds after service account gets the required missing permissions to
manage the bundle's resources
Given ServiceAccount "olm-sa" is available in ${TEST_NAMESPACE}
Given ServiceAccount "olm-sa" is available in test namespace
And ClusterExtension is applied
"""
apiVersion: olm.operatorframework.io/v1
Expand All @@ -145,7 +145,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
"""
Namespace:"" APIGroups:[apiextensions.k8s.io] Resources:[customresourcedefinitions] ResourceNames:[olme2etests.olm.operatorframework.io] Verbs:[delete,get,patch,update]
"""
When ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
Then ClusterExtension is available
And ClusterExtension reports Progressing as True with Reason Succeeded
And ClusterExtension reports Installed as True
Expand All @@ -163,7 +163,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
# - If the controller stopped reconciling, the configmap would stay deleted
# - Resource restoration is an observable event that PROVES active reconciliation
# - The deployment staying healthy proves the workload continues running
Given ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
And ClusterExtension is applied
"""
apiVersion: olm.operatorframework.io/v1
Expand Down Expand Up @@ -203,7 +203,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
# - Reconciliation completing (observedGeneration == generation) proves the spec was processed
# - Progressing=Succeeded proves the controller didn't block on missing catalog
# - Extension staying Available proves workload continues running
Given ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
And ClusterExtension is applied
"""
apiVersion: olm.operatorframework.io/v1
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/status.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Feature: Report status of the managed ClusterExtension workload
Background:
Given OLM is available
And ClusterCatalog "test" serves bundles
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
And ClusterExtension is applied
"""
apiVersion: olm.operatorframework.io/v1
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/uninstall.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Feature: Uninstall ClusterExtension
Background:
Given OLM is available
And ClusterCatalog "test" serves bundles
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
And ClusterExtension is applied
"""
apiVersion: olm.operatorframework.io/v1
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/update.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Feature: Update ClusterExtension
Background:
Given OLM is available
And ClusterCatalog "test" serves bundles
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
And ServiceAccount "olm-sa" with needed permissions is available in test namespace

Scenario: Update to a successor version
Given ClusterExtension is applied
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/user-managed-fields.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Feature: Preserve user-managed fields on deployed resources
Background:
Given OLM is available
And ClusterCatalog "test" serves bundles
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
And ClusterExtension is applied
"""
apiVersion: olm.operatorframework.io/v1
Expand Down
5 changes: 2 additions & 3 deletions test/e2e/steps/steps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,8 @@ func RegisterSteps(sc *godog.ScenarioContext) {

sc.Step(`^(?i)ServiceAccount "([^"]*)" with permissions to install extensions is available in "([^"]*)" namespace$`, ServiceAccountWithNeededPermissionsIsAvailableInGivenNamespace)
sc.Step(`^(?i)ServiceAccount "([^"]*)" with needed permissions is available in test namespace$`, ServiceAccountWithNeededPermissionsIsAvailableInTestNamespace)
sc.Step(`^(?i)ServiceAccount "([^"]*)" with needed permissions is available in \${TEST_NAMESPACE}$`, ServiceAccountWithNeededPermissionsIsAvailableInTestNamespace)
sc.Step(`^(?i)ServiceAccount "([^"]*)" without create permissions is available in \${TEST_NAMESPACE}$`, ServiceAccountWithoutCreatePermissionsIsAvailableInTestNamespace)
sc.Step(`^(?i)ServiceAccount "([^"]*)" is available in \${TEST_NAMESPACE}$`, ServiceAccountIsAvailableInNamespace)
sc.Step(`^(?i)ServiceAccount "([^"]*)" without create permissions is available in test namespace$`, ServiceAccountWithoutCreatePermissionsIsAvailableInTestNamespace)
sc.Step(`^(?i)ServiceAccount "([^"]*)" is available in test namespace$`, ServiceAccountIsAvailableInNamespace)
Comment thread
perdasilva marked this conversation as resolved.
sc.Step(`^(?i)ServiceAccount "([^"]*)" in test namespace is cluster admin$`, ServiceAccountWithClusterAdminPermissionsIsAvailableInNamespace)
sc.Step(`^(?i)ServiceAccount "([^"]+)" in test namespace has permissions to fetch "([^"]+)" metrics$`, ServiceAccountWithFetchMetricsPermissions)
sc.Step(`^(?i)ServiceAccount "([^"]+)" sends request to "([^"]+)" endpoint of "([^"]+)" service$`, SendMetricsRequest)
Expand Down
Loading