diff --git a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/AROSwift/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/AROSwift/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml index b00f96de089f..b5fe39c822c1 100644 --- a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/AROSwift/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml +++ b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/AROSwift/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml @@ -136,6 +136,7 @@ spec: cp -R /manifests /var/payload/ rm -f /var/payload/manifests/*_deployment.yaml rm -f /var/payload/manifests/*_servicemonitor.yaml + rm -f /var/payload/manifests/0000_50_cluster-update-console-plugin_* cp -R /release-manifests /var/payload/ for file in $(find /var/payload/manifests/ -name "*.yaml"); do IFS=',' read -ra feature_sets <<< "$(cat $file | grep "release.openshift.io/feature-set:" | awk '{print $2}')" diff --git a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/GCP/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/GCP/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml index 5bfe7c6f97e1..d749d5a33cb5 100644 --- a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/GCP/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml +++ b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/GCP/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml @@ -147,6 +147,7 @@ spec: cp -R /manifests /var/payload/ rm -f /var/payload/manifests/*_deployment.yaml rm -f /var/payload/manifests/*_servicemonitor.yaml + rm -f /var/payload/manifests/0000_50_cluster-update-console-plugin_* cp -R /release-manifests /var/payload/ for file in $(find /var/payload/manifests/ -name "*.yaml"); do IFS=',' read -ra feature_sets <<< "$(cat $file | grep "release.openshift.io/feature-set:" | awk '{print $2}')" diff --git a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/IBMCloud/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/IBMCloud/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml index 63d43f692530..44b35868cb97 100644 --- a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/IBMCloud/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml +++ b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/IBMCloud/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml @@ -136,6 +136,7 @@ spec: cp -R /manifests /var/payload/ rm -f /var/payload/manifests/*_deployment.yaml rm -f /var/payload/manifests/*_servicemonitor.yaml + rm -f /var/payload/manifests/0000_50_cluster-update-console-plugin_* cp -R /release-manifests /var/payload/ for file in $(find /var/payload/manifests/ -name "*.yaml"); do IFS=',' read -ra feature_sets <<< "$(cat $file | grep "release.openshift.io/feature-set:" | awk '{print $2}')" diff --git a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/TechPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/TechPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml index 8e80959cc373..bae86502d188 100644 --- a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/TechPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml +++ b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/TechPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml @@ -136,6 +136,7 @@ spec: cp -R /manifests /var/payload/ rm -f /var/payload/manifests/*_deployment.yaml rm -f /var/payload/manifests/*_servicemonitor.yaml + rm -f /var/payload/manifests/0000_50_cluster-update-console-plugin_* cp -R /release-manifests /var/payload/ for file in $(find /var/payload/manifests/ -name "*.yaml"); do IFS=',' read -ra feature_sets <<< "$(cat $file | grep "release.openshift.io/feature-set:" | awk '{print $2}')" diff --git a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml index b00f96de089f..b5fe39c822c1 100644 --- a/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml +++ b/control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yaml @@ -136,6 +136,7 @@ spec: cp -R /manifests /var/payload/ rm -f /var/payload/manifests/*_deployment.yaml rm -f /var/payload/manifests/*_servicemonitor.yaml + rm -f /var/payload/manifests/0000_50_cluster-update-console-plugin_* cp -R /release-manifests /var/payload/ for file in $(find /var/payload/manifests/ -name "*.yaml"); do IFS=',' read -ra feature_sets <<< "$(cat $file | grep "release.openshift.io/feature-set:" | awk '{print $2}')" diff --git a/control-plane-operator/controllers/hostedcontrolplane/v2/cvo/deployment.go b/control-plane-operator/controllers/hostedcontrolplane/v2/cvo/deployment.go index 5804aed41b22..7713ebe04d97 100644 --- 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/0000_50_cluster-update-console-plugin_*", payloadDir), fmt.Sprintf("cp -R /release-manifests %s/", payloadDir), )