Skip to content

Commit 8406e57

Browse files
Per G. da Silvaclaude
andcommitted
🌱 Remove duplicate collision e2e test from install.feature
The test now lives in update.feature only. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 72ad150 commit 8406e57

1 file changed

Lines changed: 0 additions & 97 deletions

File tree

test/e2e/features/install.feature

Lines changed: 0 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -678,100 +678,3 @@ Feature: Install ClusterExtension
678678
Then ClusterExtension is available
679679
And ClusterExtension reports Progressing as True with Reason Succeeded
680680
And ClusterExtension reports Installed as True
681-
682-
@BoxcutterRuntime
683-
@DeploymentConfig
684-
Scenario: A conflicting ClusterExtension with a higher revision does not take over resources from the original owner
685-
Given a catalog "test" with packages:
686-
| package | version | channel | replaces | contents |
687-
| test | 1.0.0 | alpha | | CRD, Deployment, ConfigMap |
688-
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
689-
# Install the first ClusterExtension and verify it is installed with a single ClusterObjectSet
690-
When ClusterExtension is applied
691-
"""
692-
apiVersion: olm.operatorframework.io/v1
693-
kind: ClusterExtension
694-
metadata:
695-
name: ${NAME}
696-
spec:
697-
namespace: ${TEST_NAMESPACE}
698-
serviceAccount:
699-
name: olm-sa
700-
source:
701-
sourceType: Catalog
702-
catalog:
703-
packageName: ${PACKAGE:test}
704-
version: 1.0.0
705-
selector:
706-
matchLabels:
707-
"olm.operatorframework.io/metadata.name": ${CATALOG:test}
708-
"""
709-
Then ClusterExtension is rolled out
710-
And ClusterExtension is available
711-
And ClusterExtension "${NAME}" has 1 ClusterObjectSet
712-
# Track the first ClusterExtension for cleanup before applying the second one
713-
And the current ClusterExtension is tracked for cleanup
714-
# Apply a second ClusterExtension pointing to the same package and version
715-
When ClusterExtension is applied
716-
"""
717-
apiVersion: olm.operatorframework.io/v1
718-
kind: ClusterExtension
719-
metadata:
720-
name: ${NAME}-dup
721-
spec:
722-
namespace: ${TEST_NAMESPACE}
723-
serviceAccount:
724-
name: olm-sa
725-
source:
726-
sourceType: Catalog
727-
catalog:
728-
packageName: ${PACKAGE:test}
729-
version: 1.0.0
730-
selector:
731-
matchLabels:
732-
"olm.operatorframework.io/metadata.name": ${CATALOG:test}
733-
"""
734-
# The second ClusterExtension should be retrying because of resource collisions
735-
Then ClusterExtension reports Progressing as True with Reason Retrying and Message includes:
736-
"""
737-
revision object collisions
738-
"""
739-
# Update the conflicting ClusterExtension with a deployment config env var. At the time
740-
# of writing, there is no other way to get the operator controller to generate another
741-
# ClusterObjectSet by simply targeting another bundle version in the ClusterExtension.
742-
# Since nothing has been installed yet for this CE, the resolver returns the currently
743-
# installed bundle. Injecting an environment variable via DeploymentConfig changes the
744-
# desired state, which causes the controller to create a second ClusterObjectSet
745-
# (revision 2) after the first one collides.
746-
When ClusterExtension is updated
747-
"""
748-
apiVersion: olm.operatorframework.io/v1
749-
kind: ClusterExtension
750-
metadata:
751-
name: ${NAME}
752-
spec:
753-
namespace: ${TEST_NAMESPACE}
754-
serviceAccount:
755-
name: olm-sa
756-
config:
757-
configType: Inline
758-
inline:
759-
deploymentConfig:
760-
env:
761-
- name: MY_VAR
762-
value: "my-value"
763-
source:
764-
sourceType: Catalog
765-
catalog:
766-
packageName: ${PACKAGE:test}
767-
version: 1.0.0
768-
selector:
769-
matchLabels:
770-
"olm.operatorframework.io/metadata.name": ${CATALOG:test}
771-
"""
772-
Then ClusterExtension "${NAME}" has 2 ClusterObjectSets
773-
# The higher-revision COS (revision 2) should also collide, not take over resources
774-
And ClusterExtension reports Progressing as True with Reason Retrying and Message includes:
775-
"""
776-
revision object collisions
777-
"""

0 commit comments

Comments
 (0)