forked from grafana/loki
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
operator: Add warning for old schema configuration (grafana#11158)
Co-authored-by: Robert Jacob <[email protected]> Co-authored-by: Periklis Tsirakidis <[email protected]>
- Loading branch information
Showing
10 changed files
with
349 additions
and
237 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package status | ||
|
|
||
| import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
|
|
||
| func mergeConditions(old, active []metav1.Condition, now metav1.Time) []metav1.Condition { | ||
| merged := make([]metav1.Condition, 0, len(old)+len(active)) | ||
| for len(old) > 0 { | ||
| c := old[0] | ||
| found := -1 | ||
| for i, ac := range active { | ||
| if c.Type == ac.Type && c.Reason == ac.Reason { | ||
| found = i | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if found != -1 { | ||
| c = active[found] | ||
| active = append(active[:found], active[found+1:]...) | ||
|
|
||
| c.Status = metav1.ConditionTrue | ||
| } else { | ||
| c.Status = metav1.ConditionFalse | ||
| } | ||
|
|
||
| c.LastTransitionTime = now | ||
| merged = append(merged, c) | ||
| old = old[1:] | ||
| } | ||
|
|
||
| for _, c := range active { | ||
| c.Status = metav1.ConditionTrue | ||
| c.LastTransitionTime = now | ||
| merged = append(merged, c) | ||
| } | ||
| return merged | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| package status | ||
|
|
||
| import ( | ||
| "github.com/google/go-cmp/cmp" | ||
| lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "testing" | ||
| "time" | ||
| ) | ||
|
|
||
| func TestMergeConditions(t *testing.T) { | ||
| now := metav1.NewTime(time.Unix(0, 0)) | ||
| tt := []struct { | ||
| desc string | ||
| old []metav1.Condition | ||
| active []metav1.Condition | ||
| wantMerged []metav1.Condition | ||
| }{ | ||
| { | ||
| desc: "set status and time", | ||
| old: []metav1.Condition{}, | ||
| active: []metav1.Condition{ | ||
| conditionReady, | ||
| }, | ||
| wantMerged: []metav1.Condition{ | ||
| { | ||
| Type: conditionReady.Type, | ||
| Status: metav1.ConditionTrue, | ||
| LastTransitionTime: now, | ||
| Reason: conditionReady.Reason, | ||
| Message: conditionReady.Message, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| desc: "reset old condition", | ||
| old: []metav1.Condition{ | ||
| conditionPending, | ||
| }, | ||
| active: []metav1.Condition{ | ||
| conditionReady, | ||
| }, | ||
| wantMerged: []metav1.Condition{ | ||
| { | ||
| Type: conditionPending.Type, | ||
| Status: metav1.ConditionFalse, | ||
| LastTransitionTime: now, | ||
| Reason: conditionPending.Reason, | ||
| Message: conditionPending.Message, | ||
| }, | ||
| { | ||
| Type: conditionReady.Type, | ||
| Status: metav1.ConditionTrue, | ||
| LastTransitionTime: now, | ||
| Reason: conditionReady.Reason, | ||
| Message: conditionReady.Message, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| desc: "keep active conditions", | ||
| old: []metav1.Condition{ | ||
| { | ||
| Type: conditionReady.Type, | ||
| Status: metav1.ConditionTrue, | ||
| LastTransitionTime: now, | ||
| Reason: conditionReady.Reason, | ||
| Message: conditionReady.Message, | ||
| }, | ||
| { | ||
| Type: conditionPending.Type, | ||
| Status: metav1.ConditionFalse, | ||
| LastTransitionTime: now, | ||
| Reason: conditionPending.Reason, | ||
| Message: conditionPending.Message, | ||
| }, | ||
| }, | ||
| active: []metav1.Condition{ | ||
| conditionReady, | ||
| { | ||
| Type: string(lokiv1.ConditionWarning), | ||
| Reason: "test-warning", | ||
| Message: "test-warning-message", | ||
| }, | ||
| }, | ||
| wantMerged: []metav1.Condition{ | ||
| { | ||
| Type: conditionReady.Type, | ||
| Status: metav1.ConditionTrue, | ||
| LastTransitionTime: now, | ||
| Reason: conditionReady.Reason, | ||
| Message: conditionReady.Message, | ||
| }, | ||
| { | ||
| Type: conditionPending.Type, | ||
| Status: metav1.ConditionFalse, | ||
| LastTransitionTime: now, | ||
| Reason: conditionPending.Reason, | ||
| Message: conditionPending.Message, | ||
| }, | ||
| { | ||
| Type: string(lokiv1.ConditionWarning), | ||
| Status: metav1.ConditionTrue, | ||
| LastTransitionTime: now, | ||
| Reason: "test-warning", | ||
| Message: "test-warning-message", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range tt { | ||
| tc := tc | ||
|
|
||
| t.Run(tc.desc, func(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| beforeLenOld := len(tc.old) | ||
| beforeLenActive := len(tc.active) | ||
|
|
||
| merged := mergeConditions(tc.old, tc.active, now) | ||
|
|
||
| afterLenOld := len(tc.old) | ||
| afterLenActive := len(tc.active) | ||
|
|
||
| if diff := cmp.Diff(merged, tc.wantMerged); diff != "" { | ||
| t.Errorf("Merged conditions differ: -got+want\n%s", diff) | ||
| } | ||
|
|
||
| if beforeLenOld != afterLenOld { | ||
| t.Errorf("old length differs: got %v, want %v", afterLenOld, beforeLenOld) | ||
| } | ||
|
|
||
| if beforeLenActive != afterLenActive { | ||
| t.Errorf("active length differs: got %v, want %v", afterLenActive, beforeLenActive) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.