Add an error reason for unknown plan status

Signed-off-by: Atanas Dinov <[email protected]>
suse-edge · Aug 1, 2024 · 45c215f · 45c215f
1 parent 993d97c
commit 45c215f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/api/v1alpha1/upgradeplan_types.go b/api/v1alpha1/upgradeplan_types.go
@@ -27,6 +27,9 @@ const (
 	RancherUpgradedCondition    = "RancherUpgraded"
 	LonghornUpgradedCondition   = "LonghornUpgraded"
 
+	// UpgradeError indicates that the upgrade process has encountered a transient error.
+	UpgradeError = "Error"
+
 	// UpgradePending indicates that the upgrade process has not begun.
 	UpgradePending = "Pending"
 

diff --git a/internal/controller/helm.go b/internal/controller/helm.go
@@ -196,6 +196,6 @@ func evaluateHelmChartState(state upgrade.HelmChartState) (setCondition setCondi
 	case upgrade.ChartStateFailed:
 		return setFailedCondition, true
 	default:
-		return nil, false
+		return setErrorCondition, false
 	}
 }
diff --git a/internal/controller/reconcile_longhorn.go b/internal/controller/reconcile_longhorn.go
@@ -15,9 +15,7 @@ func (r *UpgradePlanReconciler) reconcileLonghorn(ctx context.Context, upgradePl
 	}
 
 	setCondition, requeue := evaluateHelmChartState(state)
-	if setCondition != nil {
-		setCondition(upgradePlan, lifecyclev1alpha1.LonghornUpgradedCondition, state.Message())
-	}
+	setCondition(upgradePlan, lifecyclev1alpha1.LonghornUpgradedCondition, state.Message())
 
 	return ctrl.Result{Requeue: requeue}, nil
 }
diff --git a/internal/controller/reconcile_rancher.go b/internal/controller/reconcile_rancher.go
@@ -15,9 +15,7 @@ func (r *UpgradePlanReconciler) reconcileRancher(ctx context.Context, upgradePla
 	}
 
 	setCondition, requeue := evaluateHelmChartState(state)
-	if setCondition != nil {
-		setCondition(upgradePlan, lifecyclev1alpha1.RancherUpgradedCondition, state.Message())
-	}
+	setCondition(upgradePlan, lifecyclev1alpha1.RancherUpgradedCondition, state.Message())
 
 	return ctrl.Result{Requeue: requeue}, nil
 }
diff --git a/internal/controller/upgradeplan_controller.go b/internal/controller/upgradeplan_controller.go
@@ -190,6 +190,11 @@ func setPendingCondition(plan *lifecyclev1alpha1.UpgradePlan, conditionType, mes
 	meta.SetStatusCondition(&plan.Status.Conditions, condition)
 }
 
+func setErrorCondition(plan *lifecyclev1alpha1.UpgradePlan, conditionType, message string) {
+	condition := metav1.Condition{Type: conditionType, Status: metav1.ConditionUnknown, Reason: lifecyclev1alpha1.UpgradeError, Message: message}
+	meta.SetStatusCondition(&plan.Status.Conditions, condition)
+}
+
 func setInProgressCondition(plan *lifecyclev1alpha1.UpgradePlan, conditionType, message string) {
 	condition := metav1.Condition{Type: conditionType, Status: metav1.ConditionFalse, Reason: lifecyclev1alpha1.UpgradeInProgress, Message: message}
 	meta.SetStatusCondition(&plan.Status.Conditions, condition)