Skip to content

Commit f088c29

Browse files
review changes
1 parent 7c23624 commit f088c29

1 file changed

Lines changed: 6 additions & 55 deletions

File tree

test/e2e/features/recover.feature

Lines changed: 6 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ Feature: Recover cluster extension from errors that might occur during its lifet
142142
And ClusterExtension is available
143143
And resource "deployment/test-operator" is available
144144
And resource "configmap/test-configmap" is available
145-
And ClusterCatalog "test" is deleted
146145
# Catalog deletion triggers automatic reconciliation via ClusterCatalog watch
147146
# Wait for reconciliation to complete by checking the status condition
148-
When ClusterExtension reports Installed as True
149-
Then resource "deployment/test-operator" is available
147+
When ClusterCatalog "test" is deleted
148+
Then ClusterExtension reports Installed as True
149+
And resource "deployment/test-operator" is available
150150
And resource "configmap/test-configmap" is available
151151

152152
Scenario: Resources are restored after catalog deletion
@@ -249,63 +249,14 @@ Feature: Recover cluster extension from errors that might occur during its lifet
249249
And ClusterExtension is rolled out
250250
And ClusterExtension is available
251251
And bundle "test-operator.1.0.0" is installed in version "1.0.0"
252-
And ClusterCatalog "test" is deleted
253-
When ClusterExtension is updated to change version
254-
"""
255-
apiVersion: olm.operatorframework.io/v1
256-
kind: ClusterExtension
257-
metadata:
258-
name: ${NAME}
259-
spec:
260-
namespace: ${TEST_NAMESPACE}
261-
serviceAccount:
262-
name: olm-sa
263-
source:
264-
sourceType: Catalog
265-
catalog:
266-
packageName: test
267-
version: "1.0.1"
268-
selector:
269-
matchLabels:
270-
"olm.operatorframework.io/metadata.name": test-catalog
271-
"""
252+
When ClusterCatalog "test" is deleted
253+
And ClusterExtension is updated to version "1.0.1"
272254
# Wait for reconciliation after the version change request
255+
# Note: Retrying status means controller will auto-upgrade when catalog becomes available
273256
And ClusterExtension reports Progressing as True with Reason Retrying
274257
# Verify upgrade did not proceed: version remains at 1.0.0 (not 1.0.1)
275258
Then bundle "test-operator.1.0.0" is installed in version "1.0.0"
276259
And ClusterExtension reports Installed as True
277-
# Note: Retrying status means controller will auto-upgrade when catalog becomes available
278-
279-
@BoxcutterRuntime
280-
Scenario: Extension with revisions continues running after catalog deletion
281-
Given ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
282-
And ClusterExtension is applied
283-
"""
284-
apiVersion: olm.operatorframework.io/v1
285-
kind: ClusterExtension
286-
metadata:
287-
name: ${NAME}
288-
spec:
289-
namespace: ${TEST_NAMESPACE}
290-
serviceAccount:
291-
name: olm-sa
292-
source:
293-
sourceType: Catalog
294-
catalog:
295-
packageName: test
296-
selector:
297-
matchLabels:
298-
"olm.operatorframework.io/metadata.name": test-catalog
299-
"""
300-
And ClusterExtension is rolled out
301-
And ClusterExtension is available
302-
And ClusterExtensionRevision "${NAME}-1" reports Available as True with Reason ProbesSucceeded
303-
And resource "deployment/test-operator" is available
304-
And ClusterCatalog "test" is deleted
305-
# Wait for reconciliation to complete after catalog deletion
306-
When ClusterExtension reports Installed as True
307-
Then resource "deployment/test-operator" is available
308-
And ClusterExtensionRevision "${NAME}-1" reports Available as True with Reason ProbesSucceeded
309260

310261
@BoxcutterRuntime
311262
Scenario: Revision remains available after catalog deletion

0 commit comments

Comments
 (0)