OTA-1956: Skip ConsolePlugin manifests during CVO bootstrap

jhadvig · claude · jhadvig · commit 1e4b5e93a73c · 2026-06-25T23:03:44.000+02:00
The ConsolePlugin CRD (console.openshift.io/v1) is not available during
HyperShift bootstrap — the console operator has not started yet. The
CVO bootstrap init container gets stuck in an infinite retry loop
trying to kubectl apply the ConsolePlugin manifest.

Add *_consoleplugin.yaml to the wildcard removals alongside the
existing *_deployment.yaml and *_servicemonitor.yaml patterns.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/control-plane-operator/controllers/hostedcontrolplane/v2/cvo/deployment.go b/control-plane-operator/controllers/hostedcontrolplane/v2/cvo/deployment.go
@@ -204,6 +204,7 @@ func preparePayloadScript(platformType hyperv1.PlatformType, oauthEnabled bool,
 		fmt.Sprintf("cp -R /manifests %s/", payloadDir),
 		fmt.Sprintf("rm -f %s/manifests/*_deployment.yaml", payloadDir),
 		fmt.Sprintf("rm -f %s/manifests/*_servicemonitor.yaml", payloadDir),
+		fmt.Sprintf("rm -f %s/manifests/*_consoleplugin.yaml", payloadDir),
 		fmt.Sprintf("cp -R /release-manifests %s/", payloadDir),
 	)
 

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,7 @@ func preparePayloadScript(platformType hyperv1.PlatformType, oauthEnabled bool,`
`204`	`204`	`fmt.Sprintf("cp -R /manifests %s/", payloadDir),`
`205`	`205`	`fmt.Sprintf("rm -f %s/manifests/*_deployment.yaml", payloadDir),`
`206`	`206`	`fmt.Sprintf("rm -f %s/manifests/*_servicemonitor.yaml", payloadDir),`
	`207`	`+ fmt.Sprintf("rm -f %s/manifests/*_consoleplugin.yaml", payloadDir),`
`207`	`208`	`fmt.Sprintf("cp -R /release-manifests %s/", payloadDir),`
`208`	`209`	`)`
`209`	`210`