From a102d95cf964c38c916db6b3acc0bc0f604e2705 Mon Sep 17 00:00:00 2001
From: Sunny <darkowlzz@protonmail.com>
Date: Tue, 15 Mar 2022 02:21:21 +0530
Subject: [PATCH] Prioritize StorageOperationFailedCondition

Prioritize StorageOperationFailedCondition over other artifact outdated
and unavailable conditions so that when artifact is failing due to
storage operation, it's visble in the ready status condition, making the
reason for not ready more accurate.

Signed-off-by: Sunny <darkowlzz@protonmail.com>
---
 controllers/bucket_controller.go         | 6 +++---
 controllers/gitrepository_controller.go  | 6 +++---
 controllers/helmchart_controller.go      | 6 +++---
 controllers/helmrepository_controller.go | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/controllers/bucket_controller.go b/controllers/bucket_controller.go
index 80f99e6f..46a6bc64 100644
--- a/controllers/bucket_controller.go
+++ b/controllers/bucket_controller.go
@@ -75,23 +75,23 @@ var bucketReadyCondition = summarize.Conditions{
 	Target: meta.ReadyCondition,
 	Owned: []string{
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.ReadyCondition,
 		meta.ReconcilingCondition,
 		meta.StalledCondition,
 	},
 	Summarize: []string{
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},
 	NegativePolarity: []string{
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},
diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go
index 514653f6..6fa4bc10 100644
--- a/controllers/gitrepository_controller.go
+++ b/controllers/gitrepository_controller.go
@@ -62,9 +62,9 @@ var gitRepositoryReadyCondition = summarize.Conditions{
 	Owned: []string{
 		sourcev1.SourceVerifiedCondition,
 		sourcev1.FetchFailedCondition,
+		sourcev1.StorageOperationFailedCondition,
 		sourcev1.IncludeUnavailableCondition,
 		sourcev1.ArtifactOutdatedCondition,
-		sourcev1.StorageOperationFailedCondition,
 		meta.ReadyCondition,
 		meta.ReconcilingCondition,
 		meta.StalledCondition,
@@ -73,16 +73,16 @@ var gitRepositoryReadyCondition = summarize.Conditions{
 		sourcev1.IncludeUnavailableCondition,
 		sourcev1.SourceVerifiedCondition,
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},
 	NegativePolarity: []string{
 		sourcev1.FetchFailedCondition,
 		sourcev1.IncludeUnavailableCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},
diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
index 5e9d5b2b..d6c2e4e1 100644
--- a/controllers/helmchart_controller.go
+++ b/controllers/helmchart_controller.go
@@ -71,8 +71,8 @@ var helmChartReadyCondition = summarize.Conditions{
 	Owned: []string{
 		sourcev1.BuildFailedCondition,
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.ReadyCondition,
 		meta.ReconcilingCondition,
 		meta.StalledCondition,
@@ -80,16 +80,16 @@ var helmChartReadyCondition = summarize.Conditions{
 	Summarize: []string{
 		sourcev1.BuildFailedCondition,
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},
 	NegativePolarity: []string{
 		sourcev1.BuildFailedCondition,
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},
diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
index 82bae2ac..1a2c3087 100644
--- a/controllers/helmrepository_controller.go
+++ b/controllers/helmrepository_controller.go
@@ -58,23 +58,23 @@ var helmRepositoryReadyCondition = summarize.Conditions{
 	Target: meta.ReadyCondition,
 	Owned: []string{
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.ReadyCondition,
 		meta.ReconcilingCondition,
 		meta.StalledCondition,
 	},
 	Summarize: []string{
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},
 	NegativePolarity: []string{
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},