Skip to content

Commit 0dd67e6

Browse files
Merge pull request #8839 from jhadvig/skip-consoleplugin-bootstrap
OTA-1956: Skip ConsolePlugin manifests during CVO bootstrap
2 parents 80f3425 + 24ac382 commit 0dd67e6

6 files changed

Lines changed: 6 additions & 0 deletions

control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/AROSwift/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/GCP/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/IBMCloud/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/TechPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

control-plane-operator/controllers/hostedcontrolplane/v2/cvo/deployment.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ func preparePayloadScript(platformType hyperv1.PlatformType, oauthEnabled bool,
204204
fmt.Sprintf("cp -R /manifests %s/", payloadDir),
205205
fmt.Sprintf("rm -f %s/manifests/*_deployment.yaml", payloadDir),
206206
fmt.Sprintf("rm -f %s/manifests/*_servicemonitor.yaml", payloadDir),
207+
fmt.Sprintf("rm -f %s/manifests/0000_50_cluster-update-console-plugin_*", payloadDir),
207208
fmt.Sprintf("cp -R /release-manifests %s/", payloadDir),
208209
)
209210

0 commit comments

Comments
 (0)