minor fixes for addon upgrades (harvester#4300)

* minor changes for how addon upgrade path is processed to ensure correct timestamps for conditions * change value of AddonOperationFailed condition to OperationFailed
nbhatta7 · Jul 28, 2023 · 4fa5c09 · 4fa5c09
1 parent 28a1da7
commit 4fa5c09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkg/apis/harvesterhci.io/v1beta1/addon.go b/pkg/apis/harvesterhci.io/v1beta1/addon.go
@@ -24,7 +24,7 @@ type AddonOperation string
 var (
 	AddonOperationInProgress condition.Cond = "InProgress"
 	AddonOperationCompleted  condition.Cond = "Completed"
-	AddonOperationFailed     condition.Cond = "Failed"
+	AddonOperationFailed     condition.Cond = "OperationFailed"
 	DefaultJobBackOffLimit                  = int32(5)
 )
 

diff --git a/pkg/controller/master/addon/addon_processing.go b/pkg/controller/master/addon/addon_processing.go
@@ -233,6 +233,13 @@ func (h *Handler) processAddonUpgrades(a *harvesterv1.Addon) (*harvesterv1.Addon
 	}
 
 	if needed {
+		// set InProgress condition as this is needed to ensure that the in progress time stamp is setup before
+		// triggering the helm chart upgrade
+		if aObj.Status.Status != harvesterv1.AddonUpdating && !harvesterv1.AddonOperationInProgress.IsTrue(aObj) {
+			markInProgressCondition(aObj)
+			return h.addon.UpdateStatus(aObj)
+		}
+
 		hc, _, err := h.getAddonHelmChart(aObj)
 		if err != nil {
 			return aObj, err
@@ -246,9 +253,8 @@ func (h *Handler) processAddonUpgrades(a *harvesterv1.Addon) (*harvesterv1.Addon
 			return aObj, err
 		}
 
-		if aObj.Status.Status != harvesterv1.AddonUpdating || !harvesterv1.AddonOperationInProgress.IsTrue(aObj) {
+		if aObj.Status.Status != harvesterv1.AddonUpdating && harvesterv1.AddonOperationInProgress.IsTrue(aObj) {
 			aObj.Status.Status = harvesterv1.AddonUpdating
-			markInProgressCondition(aObj)
 			return h.addon.UpdateStatus(aObj)
 		}
 	}