Skip to content

Commit 1c991e2

Browse files
committed
use the time.now
Signed-off-by: Zhiying Lin <[email protected]>
1 parent b8bc481 commit 1c991e2

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

pkg/controllers/rollout/controller.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,9 +631,6 @@ func isBindingReady(binding placementv1beta1.BindingObj, readyTimeCutOff time.Ti
631631
if waitTime < 0 {
632632
return 0, true
633633
}
634-
fmt.Printf("==========================readyTimeCutOff====%v\n", readyTimeCutOff)
635-
fmt.Printf("==========================availableCondition===%v\n", availableCondition.LastTransitionTime.Time)
636-
fmt.Printf("==========================waitTime===%v\n", waitTime)
637634
// return the time we need to wait for it to be ready in this case
638635
return waitTime, false
639636
}

pkg/controllers/rollout/controller_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,9 +1907,9 @@ func TestPickBindingsToRoll(t *testing.T) {
19071907
// want the min wait time of bound bindings that are not ready
19081908
allBindingsFunc: func() []*placementv1beta1.ClusterResourceBinding {
19091909
return []*placementv1beta1.ClusterResourceBinding{
1910-
generateNotTrackableClusterResourceBinding(placementv1beta1.BindingStateBound, "snapshot-1", cluster3, metav1.Time{Time: now.Add(-35 * time.Second)}), // notReady, waitTime = t - 35s
1911-
generateCanBeReadyClusterResourceBinding(placementv1beta1.BindingStateBound, "snapshot-1", cluster1), // notReady, no wait time because it does not have available condition yet,
1912-
generateReadyClusterResourceBinding(placementv1beta1.BindingStateBound, "snapshot-2", cluster2), // Ready
1910+
generateNotTrackableClusterResourceBinding(placementv1beta1.BindingStateBound, "snapshot-1", cluster3, metav1.Time{Time: time.Now().Add(-35 * time.Second)}), // notReady, waitTime = t - 35s
1911+
generateCanBeReadyClusterResourceBinding(placementv1beta1.BindingStateBound, "snapshot-1", cluster1), // notReady, no wait time because it does not have available condition yet,
1912+
generateReadyClusterResourceBinding(placementv1beta1.BindingStateBound, "snapshot-2", cluster2), // Ready
19131913
}
19141914
},
19151915
latestResourceSnapshotName: "snapshot-2",
@@ -1948,8 +1948,8 @@ func TestPickBindingsToRoll(t *testing.T) {
19481948
// want the min wait time of unscheduled bindings that are not ready
19491949
allBindingsFunc: func() []*placementv1beta1.ClusterResourceBinding {
19501950
return []*placementv1beta1.ClusterResourceBinding{
1951-
generateNotTrackableClusterResourceBinding(placementv1beta1.BindingStateUnscheduled, "snapshot-1", cluster2, metav1.Time{Time: now.Add(-1 * time.Minute)}), // NotReady, waitTime = t - 60s
1952-
generateNotTrackableClusterResourceBinding(placementv1beta1.BindingStateUnscheduled, "snapshot-1", cluster3, metav1.Time{Time: now.Add(-35 * time.Second)}), // NotReady, waitTime = t - 35s
1951+
generateNotTrackableClusterResourceBinding(placementv1beta1.BindingStateUnscheduled, "snapshot-1", cluster2, metav1.Time{Time: time.Now().Add(-1 * time.Minute)}), // NotReady, waitTime = t - 60s
1952+
generateNotTrackableClusterResourceBinding(placementv1beta1.BindingStateUnscheduled, "snapshot-1", cluster3, metav1.Time{Time: time.Now().Add(-35 * time.Second)}), // NotReady, waitTime = t - 35s
19531953
}
19541954
},
19551955
latestResourceSnapshotName: "snapshot-2",

0 commit comments

Comments
 (0)