openshift · openshift-merge-bot · Mar 27, 2026 · Mar 26, 2026 · enxebre · Mar 25, 2026
diff --git a/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go b/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
@@ -1172,19 +1172,20 @@ func (r *HostedControlPlaneReconciler) reconcileCPOV2(ctx context.Context, hcp *
 	}
 
 	cpContext := component.ControlPlaneContext{
-		Context:                   ctx,
-		Client:                    r.Client,
-		GVKAccessChecker:          r.GVKAccessChecker,
-		HCP:                       hcp,
-		ApplyProvider:             upsert.NewApplyProvider(r.EnableCIDebugOutput),
-		InfraStatus:               infraStatus,
-		ReleaseImageProvider:      releaseImageProvider,
-		UserReleaseImageProvider:  userReleaseImageProvider,
-		SetDefaultSecurityContext: r.SetDefaultSecurityContext,
-		DefaultSecurityContextUID: r.DefaultSecurityContextUID,
-		MetricsSet:                r.MetricsSet,
-		EnableCIDebugOutput:       r.EnableCIDebugOutput,
-		ImageMetadataProvider:     r.ImageMetadataProvider,
+		Context:                        ctx,
+		Client:                         r.Client,
+		GVKAccessChecker:               r.GVKAccessChecker,
+		HCP:                            hcp,
+		ApplyProvider:                  upsert.NewApplyProvider(r.EnableCIDebugOutput),
+		InfraStatus:                    infraStatus,
+		ReleaseImageProvider:           releaseImageProvider,
+		UserReleaseImageProvider:       userReleaseImageProvider,
+		SetDefaultSecurityContext:      r.SetDefaultSecurityContext,
+		DefaultSecurityContextUID:      r.DefaultSecurityContextUID,
+		MetricsSet:                     r.MetricsSet,
+		EnableCIDebugOutput:            r.EnableCIDebugOutput,
+		ImageMetadataProvider:          r.ImageMetadataProvider,
+		NativeSidecarContainersEnabled: r.ManagementClusterCapabilities.Has(capabilities.CapabilityNativeSidecarContainers),
 	}
 
 	var errs []error

diff --git a/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go b/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
@@ -1228,9 +1228,10 @@ func TestControlPlaneComponents(t *testing.T) {
 				},
 				Manifest: fakeimagemetadataprovider.FakeManifest{},
 			},
-			HCP:                    hcp,
-			SkipPredicate:          true,
-			SkipCertificateSigning: true,
+			HCP:                            hcp,
+			SkipPredicate:                  true,
+			SkipCertificateSigning:         true,
+			NativeSidecarContainersEnabled: true,
 		}
 
 		cpContext.HCP.Spec.Configuration.FeatureGate.FeatureGateSelection.FeatureSet = tt.featureSet

diff --git a/...er/GCP/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_deployment.yaml b/...er/GCP/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_deployment.yaml
diff --git a/...pgrade/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_deployment.yaml b/...pgrade/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_deployment.yaml
diff --git a/...anager/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_deployment.yaml b/...anager/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_deployment.yaml
diff --git a/...er/GCP/zz_fixture_TestControlPlaneComponents_aws_node_termination_handler_deployment.yaml b/...er/GCP/zz_fixture_TestControlPlaneComponents_aws_node_termination_handler_deployment.yaml
diff --git a/...pgrade/zz_fixture_TestControlPlaneComponents_aws_node_termination_handler_deployment.yaml b/...pgrade/zz_fixture_TestControlPlaneComponents_aws_node_termination_handler_deployment.yaml
diff --git a/...andler/zz_fixture_TestControlPlaneComponents_aws_node_termination_handler_deployment.yaml b/...andler/zz_fixture_TestControlPlaneComponents_aws_node_termination_handler_deployment.yaml
diff --git a/.../GCP/zz_fixture_TestControlPlaneComponents_azure_cloud_controller_manager_deployment.yaml b/.../GCP/zz_fixture_TestControlPlaneComponents_azure_cloud_controller_manager_deployment.yaml
diff --git a/...rade/zz_fixture_TestControlPlaneComponents_azure_cloud_controller_manager_deployment.yaml b/...rade/zz_fixture_TestControlPlaneComponents_azure_cloud_controller_manager_deployment.yaml
diff --git a/...ager/zz_fixture_TestControlPlaneComponents_azure_cloud_controller_manager_deployment.yaml b/...ager/zz_fixture_TestControlPlaneComponents_azure_cloud_controller_manager_deployment.yaml