Skip to content

Commit a102d95

Browse files
committed
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 <[email protected]>
1 parent a3cbe6e commit a102d95

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

controllers/bucket_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,23 @@ var bucketReadyCondition = summarize.Conditions{
7575
Target: meta.ReadyCondition,
7676
Owned: []string{
7777
sourcev1.FetchFailedCondition,
78-
sourcev1.ArtifactOutdatedCondition,
7978
sourcev1.StorageOperationFailedCondition,
79+
sourcev1.ArtifactOutdatedCondition,
8080
meta.ReadyCondition,
8181
meta.ReconcilingCondition,
8282
meta.StalledCondition,
8383
},
8484
Summarize: []string{
8585
sourcev1.FetchFailedCondition,
86-
sourcev1.ArtifactOutdatedCondition,
8786
sourcev1.StorageOperationFailedCondition,
87+
sourcev1.ArtifactOutdatedCondition,
8888
meta.StalledCondition,
8989
meta.ReconcilingCondition,
9090
},
9191
NegativePolarity: []string{
9292
sourcev1.FetchFailedCondition,
93-
sourcev1.ArtifactOutdatedCondition,
9493
sourcev1.StorageOperationFailedCondition,
94+
sourcev1.ArtifactOutdatedCondition,
9595
meta.StalledCondition,
9696
meta.ReconcilingCondition,
9797
},

controllers/gitrepository_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ var gitRepositoryReadyCondition = summarize.Conditions{
6262
Owned: []string{
6363
sourcev1.SourceVerifiedCondition,
6464
sourcev1.FetchFailedCondition,
65+
sourcev1.StorageOperationFailedCondition,
6566
sourcev1.IncludeUnavailableCondition,
6667
sourcev1.ArtifactOutdatedCondition,
67-
sourcev1.StorageOperationFailedCondition,
6868
meta.ReadyCondition,
6969
meta.ReconcilingCondition,
7070
meta.StalledCondition,
@@ -73,16 +73,16 @@ var gitRepositoryReadyCondition = summarize.Conditions{
7373
sourcev1.IncludeUnavailableCondition,
7474
sourcev1.SourceVerifiedCondition,
7575
sourcev1.FetchFailedCondition,
76-
sourcev1.ArtifactOutdatedCondition,
7776
sourcev1.StorageOperationFailedCondition,
77+
sourcev1.ArtifactOutdatedCondition,
7878
meta.StalledCondition,
7979
meta.ReconcilingCondition,
8080
},
8181
NegativePolarity: []string{
8282
sourcev1.FetchFailedCondition,
8383
sourcev1.IncludeUnavailableCondition,
84-
sourcev1.ArtifactOutdatedCondition,
8584
sourcev1.StorageOperationFailedCondition,
85+
sourcev1.ArtifactOutdatedCondition,
8686
meta.StalledCondition,
8787
meta.ReconcilingCondition,
8888
},

controllers/helmchart_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,25 @@ var helmChartReadyCondition = summarize.Conditions{
7171
Owned: []string{
7272
sourcev1.BuildFailedCondition,
7373
sourcev1.FetchFailedCondition,
74-
sourcev1.ArtifactOutdatedCondition,
7574
sourcev1.StorageOperationFailedCondition,
75+
sourcev1.ArtifactOutdatedCondition,
7676
meta.ReadyCondition,
7777
meta.ReconcilingCondition,
7878
meta.StalledCondition,
7979
},
8080
Summarize: []string{
8181
sourcev1.BuildFailedCondition,
8282
sourcev1.FetchFailedCondition,
83-
sourcev1.ArtifactOutdatedCondition,
8483
sourcev1.StorageOperationFailedCondition,
84+
sourcev1.ArtifactOutdatedCondition,
8585
meta.StalledCondition,
8686
meta.ReconcilingCondition,
8787
},
8888
NegativePolarity: []string{
8989
sourcev1.BuildFailedCondition,
9090
sourcev1.FetchFailedCondition,
91-
sourcev1.ArtifactOutdatedCondition,
9291
sourcev1.StorageOperationFailedCondition,
92+
sourcev1.ArtifactOutdatedCondition,
9393
meta.StalledCondition,
9494
meta.ReconcilingCondition,
9595
},

controllers/helmrepository_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,23 @@ var helmRepositoryReadyCondition = summarize.Conditions{
5858
Target: meta.ReadyCondition,
5959
Owned: []string{
6060
sourcev1.FetchFailedCondition,
61-
sourcev1.ArtifactOutdatedCondition,
6261
sourcev1.StorageOperationFailedCondition,
62+
sourcev1.ArtifactOutdatedCondition,
6363
meta.ReadyCondition,
6464
meta.ReconcilingCondition,
6565
meta.StalledCondition,
6666
},
6767
Summarize: []string{
6868
sourcev1.FetchFailedCondition,
69-
sourcev1.ArtifactOutdatedCondition,
7069
sourcev1.StorageOperationFailedCondition,
70+
sourcev1.ArtifactOutdatedCondition,
7171
meta.StalledCondition,
7272
meta.ReconcilingCondition,
7373
},
7474
NegativePolarity: []string{
7575
sourcev1.FetchFailedCondition,
76-
sourcev1.ArtifactOutdatedCondition,
7776
sourcev1.StorageOperationFailedCondition,
77+
sourcev1.ArtifactOutdatedCondition,
7878
meta.StalledCondition,
7979
meta.ReconcilingCondition,
8080
},

0 commit comments

Comments
 (0)