Merge pull request #335 from elmiko/remove-cloud-controller-owner-condition

OCPCLOUD-2515: remove CloudControllerOwner condition logic

Author: openshift-merge-bot[bot]

docs/user/troubleshooting.md

@@ -16,6 +16,8 @@ Pay attention to the status of auxiliary controllers: Cloud Config Sync and Trus
 
 ## Migration from KCM to CCM got stuck
 
+**Please note that KCM to CCM migration is only relevent for OpenShift version 4.14 and earlier.**
+
 To troubleshoot the issue we need to understand how the migration works. When `ExternalCloudProvider` feature gate is set, Kube Controller Manager Operator updates all Kube Controller Manager (KCM) pods by setting `--cloud-provider external` there, and starts observing the pods statuses. If all of them started successfully, the operator sets condition `CloudControllerOwner: False` to the `kubecontrollermanager` resource. You can check it with `oc get kubecontrollermanager cluster -o yaml`.
 
 In parallel with that CCCMO also monitors the `kubecontrollermanager` resource. It doesn't provision any Cloud Controller Manager related resources until the condition is set to False there.

pkg/controllers/clusteroperator_controller.go

@@ -133,8 +133,8 @@ func (r *CloudOperatorReconciler) Reconcile(ctx context.Context, _ ctrl.Request)
 		return ctrl.Result{}, err
 	}
 
-	if err := r.setCloudControllerOwnerCondition(ctx); err != nil {
-		klog.Errorf("Unable to sync cluster operator status: %s", err)
+	if err := r.clearCloudControllerOwnerCondition(ctx); err != nil {
+		klog.Errorf("Unable to clear CloudControllerOwner condition: %s", err)
 		return ctrl.Result{}, err
 	}
 
@@ -264,56 +264,9 @@ func (r *CloudOperatorReconciler) provisioningAllowed(ctx context.Context, infra
 		return false, nil
 	}
 
-	ownedByKCM, err := r.isCloudControllersOwnedByKCM(ctx, conditionOverrides)
-	if err != nil {
-		return false, err
-	}
-	if ownedByKCM {
-		// KCM resource found and it owns Cloud provider
-		klog.Infof("KubeControllerManager still owns Cloud Controllers. Skipping...")
-
-		if err := r.setStatusAvailable(ctx, conditionOverrides); err != nil {
-			klog.Errorf("Unable to sync cluster operator status: %s", err)
-			return false, err
-		}
-
-		return false, nil
-	}
-
 	return true, nil
 }
 
-func (r *CloudOperatorReconciler) isCloudControllersOwnedByKCM(ctx context.Context, conditionOverrides []configv1.ClusterOperatorStatusCondition) (bool, error) {
-	kcm := &operatorv1.KubeControllerManager{}
-	err := r.Get(ctx, client.ObjectKey{Name: kcmResourceName}, kcm)
-	if err != nil {
-		klog.Errorf("Unable to retrive KubeControllerManager object: %v", err)
-
-		if err := r.setStatusDegraded(ctx, err, conditionOverrides); err != nil {
-			klog.Errorf("Error syncing ClusterOperatorStatus: %v", err)
-			return false, fmt.Errorf("error syncing ClusterOperatorStatus: %v", err)
-		}
-		return false, err
-	}
-
-	if len(kcm.Status.Conditions) == 0 {
-		// If KCM Conditions object doesn't exist, we assume that we are in bootstrapping process and
-		// the controllers are not owned by KCM.
-		klog.Info("KubeControllerManager status not found, cluster is bootstrapping with external cloud providers")
-		return false, nil
-	}
-
-	// If there is no condition, we assume that KCM owns the Cloud Controllers
-	ownedByKCM := true
-	for _, cond := range kcm.Status.Conditions {
-		if cond.Type == cloudControllerOwnershipCondition {
-			ownedByKCM = cond.Status == operatorv1.ConditionTrue
-		}
-	}
-
-	return ownedByKCM, nil
-}
-
 func (r *CloudOperatorReconciler) isCloudControllersOwnedByCCM(ctx context.Context, conditionOverrides []configv1.ClusterOperatorStatusCondition) (bool, error) {
 	co, err := r.getOrCreateClusterOperator(ctx)
 	if err != nil {