🐛 e2e: skip clusterobjectset cleanup when BoxcutterRuntime is disabled (#2662)

joelanford · claude · web-flow · commit e45ca460de94 · 2026-04-20T17:30:24.000Z
Scenario cleanup unconditionally attempted to delete the pre-generated
clusterobjectset resource, but the CRD only exists when BoxcutterRuntime
is enabled. Guard the deletion with a feature gate check.

Co-authored-by: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/test/e2e/steps/hooks.go b/test/e2e/steps/hooks.go
@@ -216,7 +216,7 @@ func ScenarioCleanup(ctx context.Context, _ *godog.Scenario, err error) (context
 	if sc.clusterExtensionName != "" {
 		forDeletion = append(forDeletion, resource{name: sc.clusterExtensionName, kind: "clusterextension"})
 	}
-	if sc.clusterObjectSetName != "" {
+	if sc.clusterObjectSetName != "" && featureGates[features.BoxcutterRuntime] {
 		forDeletion = append(forDeletion, resource{name: sc.clusterObjectSetName, kind: "clusterobjectset"})
 	}
 	forDeletion = append(forDeletion, resource{name: sc.namespace, kind: "namespace"})

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ func ScenarioCleanup(ctx context.Context, _ *godog.Scenario, err error) (context`
`216`	`216`	`if sc.clusterExtensionName != "" {`
`217`	`217`	`forDeletion = append(forDeletion, resource{name: sc.clusterExtensionName, kind: "clusterextension"})`
`218`	`218`	`}`
`219`		`- if sc.clusterObjectSetName != "" {`
	`219`	`+ if sc.clusterObjectSetName != "" && featureGates[features.BoxcutterRuntime] {`
`220`	`220`	`forDeletion = append(forDeletion, resource{name: sc.clusterObjectSetName, kind: "clusterobjectset"})`
`221`	`221`	`}`
`222`	`222`	`forDeletion = append(forDeletion, resource{name: sc.namespace, kind: "namespace"})`