Merge pull request openshift#3368 from stevekuznetsov/skuznets/no-pki…

…-when-requested OCPBUGS-26197: hostedcontrolplane: don't start pki operator when disabled
bryan-cox · Jan 5, 2024 · 34e73a2 · 34e73a2
2 parents 42013f9 + 809f46f
commit 34e73a2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go b/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
@@ -1127,9 +1127,11 @@ func (r *HostedControlPlaneReconciler) reconcile(ctx context.Context, hostedCont
 	}
 
 	// Reconcile control plane pki operator
-	r.Log.Info("Reconciling Control Plane PKI Operator")
-	if err := r.reconcileControlPlanePKIOperator(ctx, hostedControlPlane, releaseImageProvider, createOrUpdate, openShiftTrustedCABundleConfigMapForCPOExists, r.CertRotationScale); err != nil {
-		return fmt.Errorf("failed to reconcile control plane pki operator: %w", err)
+	if _, exists := hostedControlPlane.Annotations[hyperv1.DisablePKIReconciliationAnnotation]; !exists {
+		r.Log.Info("Reconciling Control Plane PKI Operator")
+		if err := r.reconcileControlPlanePKIOperator(ctx, hostedControlPlane, releaseImageProvider, createOrUpdate, openShiftTrustedCABundleConfigMapForCPOExists, r.CertRotationScale); err != nil {
+			return fmt.Errorf("failed to reconcile control plane pki operator: %w", err)
+		}
 	}
 
 	// Reconcile cloud controller manager