Merge pull request opendatahub-io#91 from rimolive/rmartine

Remove some conditions in DSPA

Author: openshift-merge-robot

controllers/config/defaults.go

@@ -64,16 +64,11 @@ const (
 )
 
 const (
-	DatabaseReady               = "DatabaseReady"
-	DataBaseFailedToDeploy      = "DataBaseFailedToDeploy"
-	ObjectStorageReady          = "ObjectStorageReady"
-	ObjectStorageFailedToDeploy = "ObjectStorageFailedToDeploy"
-	APIServerReady              = "APIServerReady"
-	PersistenceAgentReady       = "PersistenceAgentReady"
-	ScheduledWorkflowReady      = "ScheduledWorkflowReady"
-	UserInterfaceReady          = "UserInterfaceReady"
-	CrReady                     = "Ready"
-	MinimumReplicasAvailable    = "MinimumReplicasAvailable"
+	APIServerReady           = "APIServerReady"
+	PersistenceAgentReady    = "PersistenceAgentReady"
+	ScheduledWorkflowReady   = "ScheduledWorkflowReady"
+	CrReady                  = "Ready"
+	MinimumReplicasAvailable = "MinimumReplicasAvailable"
 )
 
 // Any required Configmap paths can be added here,

controllers/dspipeline_controller.go

@@ -114,10 +114,7 @@ func (r *DSPAReconciler) buildCondition(conditionType string, dspa *dspav1alpha1
 	condition.ObservedGeneration = dspa.Generation
 	condition.Status = metav1.ConditionFalse
 	condition.Reason = reason
-
-	if dspa.Status.Conditions == nil {
-		condition.LastTransitionTime = metav1.Now()
-	}
+	condition.LastTransitionTime = metav1.Now()
 
 	return condition
 }
@@ -225,28 +222,16 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	// Initialize conditions
 	var conditions []metav1.Condition
 
-	databaseReady := r.buildCondition(config.DatabaseReady, dspa, config.DatabaseReady)
 	err = r.ReconcileDatabase(ctx, dspa, params)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	if r.isDeploymentAvailable(ctx, dspa, "mariadb") {
-		databaseReady.Status = metav1.ConditionTrue
-	}
-	conditions = append(conditions, databaseReady)
-
-	objectStorageReady := r.buildCondition(config.ObjectStorageReady, dspa, config.ObjectStorageReady)
 	err = r.ReconcileStorage(ctx, dspa, params)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	if r.isDeploymentAvailable(ctx, dspa, "minio") {
-		objectStorageReady.Status = metav1.ConditionTrue
-	}
-	conditions = append(conditions, objectStorageReady)
-
 	err = r.ReconcileCommon(dspa, params)
 	if err != nil {
 		return ctrl.Result{}, err
@@ -285,17 +270,11 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	}
 	conditions = append(conditions, scheduledWorkflowReady)
 
-	userInterfaceReady := r.buildCondition(config.UserInterfaceReady, dspa, config.MinimumReplicasAvailable)
 	err = r.ReconcileUI(dspa, params)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	if r.isDeploymentAvailable(ctx, dspa, "ds-pipeline-ui") {
-		userInterfaceReady.Status = metav1.ConditionTrue
-	}
-	conditions = append(conditions, userInterfaceReady)
-
 	err = r.ReconcileViewerCRD(dspa, params)
 	if err != nil {
 		return ctrl.Result{}, err
@@ -307,22 +286,17 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	crReady.Type = config.CrReady
 
 	// Compute Ready Logic for the CR
-	if ((apiServerReady.Status == metav1.ConditionTrue) &&
+	if (apiServerReady.Status == metav1.ConditionTrue) &&
 		(persistenceAgentReady.Status == metav1.ConditionTrue) &&
-		(scheduledWorkflowReady.Status == metav1.ConditionTrue) &&
-		(databaseReady.Status == metav1.ConditionTrue) &&
-		(objectStorageReady.Status == metav1.ConditionTrue)) &&
-		(userInterfaceReady.Status == metav1.ConditionTrue || (userInterfaceReady.Status == metav1.ConditionFalse && !dspa.Spec.MlPipelineUI.Deploy)) {
+		(scheduledWorkflowReady.Status == metav1.ConditionTrue) {
 		crReady.Status = metav1.ConditionTrue
 	} else {
 		crReady.Status = metav1.ConditionFalse
 	}
 	conditions = append(conditions, crReady)
 
 	for i, condition := range dspa.Status.Conditions {
-		if condition.Status != conditions[i].Status {
-			conditions[i].LastTransitionTime = metav1.Now()
-		} else {
+		if condition.Status == conditions[i].Status {
 			conditions[i].LastTransitionTime = condition.LastTransitionTime
 		}
 	}