fix(directives): potential nil deref ArgoCD health (#2891)

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
akuity · Nov 4, 2024 · 1eab368 · 1eab368
1 parent 08ffe76
commit 1eab368
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/internal/directives/argocd_health.go b/internal/directives/argocd_health.go
@@ -210,7 +210,11 @@ func (a *argocdUpdater) getApplicationHealth(
 		// TODO: revisit this when https://github.com/argoproj/argo-cd/pull/18660
 		// 	 is merged and released.
 		if app.Status.OperationState != nil {
-			cooldown := app.Status.OperationState.FinishedAt.Time.Add(10 * time.Second)
+			cooldown := time.Now()
+			if !app.Status.OperationState.FinishedAt.IsZero() {
+				cooldown = app.Status.OperationState.FinishedAt.Time
+			}
+			cooldown = cooldown.Add(10 * time.Second)
 			if duration := time.Until(cooldown); duration > 0 {
 				time.Sleep(duration)
 				// Re-fetch the application to get the latest state.