🌱 Address review: move collision e2e test to update.feature, assert original CE stays installed

- Move the higher-revision collision test from install.feature to
  update.feature where it fits better alongside the existing collision
  scenario.
- Add assertions that the original ClusterExtension remains Installed=True
  after both collision points.
- Add NamedClusterExtensionReportsCondition and
  ClusterExtensionHasClusterObjectSets step definitions.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Per G. da Silva

test/e2e/features/update.feature

@@ -338,3 +338,97 @@ Feature: Update ClusterExtension
     Then ClusterExtension reports "${NAME}-1, ${NAME}-2" as active revisions
     And ClusterObjectSet "${NAME}-2" reports Progressing as True with Reason RollingOut
     And ClusterObjectSet "${NAME}-2" reports Available as False with Reason ProbeFailure
+
+  @BoxcutterRuntime
+  @DeploymentConfig
+  Scenario: A conflicting ClusterExtension with a higher revision does not take over resources from the original owner
+    Given ClusterExtension is applied
+      """
+      apiVersion: olm.operatorframework.io/v1
+      kind: ClusterExtension
+      metadata:
+        name: ${NAME}
+      spec:
+        namespace: ${TEST_NAMESPACE}
+        serviceAccount:
+          name: olm-sa
+        source:
+          sourceType: Catalog
+          catalog:
+            packageName: ${PACKAGE:test}
+            version: 1.0.0
+            selector:
+              matchLabels:
+                "olm.operatorframework.io/metadata.name": ${CATALOG:test}
+      """
+    And ClusterExtension is rolled out
+    And ClusterExtension is available
+    And ClusterExtension "${NAME}" has 1 ClusterObjectSet
+    And the current ClusterExtension is tracked for cleanup
+    # Apply a second ClusterExtension pointing to the same package and version
+    When ClusterExtension is applied
+      """
+      apiVersion: olm.operatorframework.io/v1
+      kind: ClusterExtension
+      metadata:
+        name: ${NAME}-dup
+      spec:
+        namespace: ${TEST_NAMESPACE}
+        serviceAccount:
+          name: olm-sa
+        source:
+          sourceType: Catalog
+          catalog:
+            packageName: ${PACKAGE:test}
+            version: 1.0.0
+            selector:
+              matchLabels:
+                "olm.operatorframework.io/metadata.name": ${CATALOG:test}
+      """
+    Then ClusterExtension reports Progressing as True with Reason Retrying and Message includes:
+      """
+      revision object collisions
+      """
+    # Verify the original ClusterExtension remains installed and unaffected
+    And ClusterExtension "ce-${SCENARIO_ID}" reports Installed as True
+    # Update the conflicting ClusterExtension with a deployment config env var. At the time
+    # of writing, there is no other way to get the operator controller to generate another
+    # ClusterObjectSet by simply targeting another bundle version in the ClusterExtension.
+    # Since nothing has been installed yet for this CE, the resolver returns the currently
+    # installed bundle. Injecting an environment variable via DeploymentConfig changes the
+    # desired state, which causes the controller to create a second ClusterObjectSet
+    # (revision 2) after the first one collides.
+    When ClusterExtension is updated
+      """
+      apiVersion: olm.operatorframework.io/v1
+      kind: ClusterExtension
+      metadata:
+        name: ${NAME}
+      spec:
+        namespace: ${TEST_NAMESPACE}
+        serviceAccount:
+          name: olm-sa
+        config:
+          configType: Inline
+          inline:
+            deploymentConfig:
+              env:
+                - name: MY_VAR
+                  value: "my-value"
+        source:
+          sourceType: Catalog
+          catalog:
+            packageName: ${PACKAGE:test}
+            version: 1.0.0
+            selector:
+              matchLabels:
+                "olm.operatorframework.io/metadata.name": ${CATALOG:test}
+      """
+    Then ClusterExtension "${NAME}" has 2 ClusterObjectSets
+    # The higher-revision COS (revision 2) should also collide, not take over resources
+    And ClusterExtension reports Progressing as True with Reason Retrying and Message includes:
+      """
+      revision object collisions
+      """
+    # Verify the original ClusterExtension is still installed after the higher-revision collision
+    And ClusterExtension "ce-${SCENARIO_ID}" reports Installed as True

test/e2e/steps/steps.go

@@ -124,6 +124,7 @@ func RegisterSteps(sc *godog.ScenarioContext) {
 	sc.Step(`^(?i)ClusterExtension reports ([[:alnum:]]+) as ([[:alnum:]]+) with Reason ([[:alnum:]]+) and Message includes:$`, ClusterExtensionReportsConditionWithMessageFragment)
 	sc.Step(`^(?i)ClusterExtension reports ([[:alnum:]]+) as ([[:alnum:]]+) with Reason ([[:alnum:]]+)$`, ClusterExtensionReportsConditionWithoutMsg)
 	sc.Step(`^(?i)ClusterExtension reports ([[:alnum:]]+) as ([[:alnum:]]+)$`, ClusterExtensionReportsConditionWithoutReason)
+	sc.Step(`^(?i)ClusterExtension "([^"]+)" reports ([[:alnum:]]+) as ([[:alnum:]]+)$`, NamedClusterExtensionReportsCondition)
 	sc.Step(`^(?i)ClusterObjectSet "([^"]+)" reports ([[:alnum:]]+) as ([[:alnum:]]+) with Reason ([[:alnum:]]+)$`, ClusterObjectSetReportsConditionWithoutMsg)
 	sc.Step(`^(?i)ClusterObjectSet "([^"]+)" reports ([[:alnum:]]+) as ([[:alnum:]]+) with Reason ([[:alnum:]]+) and Message:$`, ClusterObjectSetReportsConditionWithMsg)
 	sc.Step(`^(?i)ClusterObjectSet "([^"]+)" reports ([[:alnum:]]+) as ([[:alnum:]]+) with Reason ([[:alnum:]]+) and Message includes:$`, ClusterObjectSetReportsConditionWithMessageFragment)
@@ -688,6 +689,14 @@ func ClusterExtensionReportsConditionWithoutReason(ctx context.Context, conditio
 	return waitForExtensionCondition(ctx, conditionType, conditionStatus, nil, nil)
 }
 
+// NamedClusterExtensionReportsCondition waits for a specific ClusterExtension (by name) to have a condition
+// matching type and status. Polls with timeout.
+func NamedClusterExtensionReportsCondition(ctx context.Context, extName, conditionType, conditionStatus string) error {
+	sc := scenarioCtx(ctx)
+	extName = substituteScenarioVars(extName, sc)
+	return waitForCondition(ctx, "clusterextension", extName, conditionType, conditionStatus, nil, nil)
+}
+
 // ClusterExtensionReportsConditionTransitionTime asserts that a condition's lastTransitionTime falls within
 // the specified minute range since the ClusterExtension's creation.
 func ClusterExtensionReportsConditionTransitionTime(ctx context.Context, conditionType string, minMinutes, maxMinutes int) error {