Merge pull request #613 from fluxcd/reorder-conditions

Prioritize StorageOperationFailedCondition
fluxcd · Mar 16, 2022 · e4d0b53 · e4d0b53
2 parents a3cbe6e + a102d95
commit e4d0b53
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -71,25 +71,25 @@ var helmChartReadyCondition = summarize.Conditions{
 	Owned: []string{
 		sourcev1.BuildFailedCondition,
 		sourcev1.FetchFailedCondition,
-		sourcev1.ArtifactOutdatedCondition,
 		sourcev1.StorageOperationFailedCondition,
+		sourcev1.ArtifactOutdatedCondition,
 		meta.ReadyCondition,
 		meta.ReconcilingCondition,
 		meta.StalledCondition,
 	},
 	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
@@ -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,
 	},