Skip to content

Commit bbfd0ab

Browse files
committed
replace time.Now with metav1.Now
1 parent bbf6965 commit bbfd0ab

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

pkg/networkaware/networkoverhead/networkoverhead_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ func GetAppGroupCROnlineBoutique() *agv1alpha1.AppGroup {
286286
},
287287
},
288288
Status: agv1alpha1.AppGroupStatus{
289-
ScheduleStartTime: metav1.Time{Time: time.Now()},
290-
TopologyCalculationTime: metav1.Time{Time: time.Now()},
289+
ScheduleStartTime: metav1.Now(),
290+
TopologyCalculationTime: metav1.Now(),
291291
TopologyOrder: agv1alpha1.AppGroupTopologyList{
292292
agv1alpha1.AppGroupTopologyInfo{Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p1-deployment", Selector: "p1", APIVersion: "apps/v1", Namespace: "default"}, Index: 1},
293293
agv1alpha1.AppGroupTopologyInfo{Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p10-deployment", Selector: "p10", APIVersion: "apps/v1", Namespace: "default"}, Index: 2},
@@ -330,8 +330,9 @@ func GetAppGroupCRBasic() *agv1alpha1.AppGroup {
330330
},
331331
},
332332
Status: agv1alpha1.AppGroupStatus{
333-
RunningWorkloads: 3,
334-
ScheduleStartTime: metav1.Time{Time: time.Now()}, TopologyCalculationTime: metav1.Time{Time: time.Now()},
333+
RunningWorkloads: 3,
334+
ScheduleStartTime: metav1.Now(),
335+
TopologyCalculationTime: metav1.Now(),
335336
TopologyOrder: agv1alpha1.AppGroupTopologyList{
336337
agv1alpha1.AppGroupTopologyInfo{
337338
Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p1-deployment", Selector: "p1", APIVersion: "apps/v1", Namespace: "default"}, Index: 1},

pkg/networkaware/topologicalsort/topologicalsort_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"math"
2222
"sort"
2323
"testing"
24-
"time"
2524

2625
v1 "k8s.io/api/core/v1"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -105,8 +104,8 @@ func GetAppGroupCROnlineBoutique() *agv1alpha1.AppGroup {
105104
},
106105
},
107106
Status: agv1alpha1.AppGroupStatus{
108-
ScheduleStartTime: metav1.Time{Time: time.Now()},
109-
TopologyCalculationTime: metav1.Time{Time: time.Now()},
107+
ScheduleStartTime: metav1.Now(),
108+
TopologyCalculationTime: metav1.Now(),
110109
TopologyOrder: agv1alpha1.AppGroupTopologyList{
111110
agv1alpha1.AppGroupTopologyInfo{Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p1-deployment", Selector: "p1", APIVersion: "apps/v1", Namespace: "default"}, Index: 1},
112111
agv1alpha1.AppGroupTopologyInfo{Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p10-deployment", Selector: "p10", APIVersion: "apps/v1", Namespace: "default"}, Index: 2},
@@ -145,8 +144,9 @@ func GetAppGroupCRBasic() *agv1alpha1.AppGroup {
145144
},
146145
},
147146
Status: agv1alpha1.AppGroupStatus{
148-
RunningWorkloads: 3,
149-
ScheduleStartTime: metav1.Time{Time: time.Now()}, TopologyCalculationTime: metav1.Time{Time: time.Now()},
147+
RunningWorkloads: 3,
148+
ScheduleStartTime: metav1.Now(),
149+
TopologyCalculationTime: metav1.Now(),
150150
TopologyOrder: agv1alpha1.AppGroupTopologyList{
151151
agv1alpha1.AppGroupTopologyInfo{
152152
Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p1-deployment", Selector: "p1", APIVersion: "apps/v1", Namespace: "default"}, Index: 1},

test/integration/networkoverhead_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,9 @@ func TestNetworkOverheadPlugin(t *testing.T) {
181181
},
182182
},
183183
).Status(agv1alpha1.AppGroupStatus{
184-
RunningWorkloads: 3,
185-
ScheduleStartTime: metav1.Time{Time: time.Now()}, TopologyCalculationTime: metav1.Time{Time: time.Now()},
184+
RunningWorkloads: 3,
185+
ScheduleStartTime: metav1.Now(),
186+
TopologyCalculationTime: metav1.Now(),
186187
TopologyOrder: agv1alpha1.AppGroupTopologyList{
187188
agv1alpha1.AppGroupTopologyInfo{
188189
Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p1", Selector: "p1", APIVersion: "apps/v1", Namespace: "default"}, Index: 1},

test/integration/topologicalsort_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,9 @@ func TestTopologicalSortPlugin(t *testing.T) {
144144
},
145145
},
146146
).Status(agv1alpha1.AppGroupStatus{
147-
RunningWorkloads: 3,
148-
ScheduleStartTime: metav1.Time{Time: time.Now()}, TopologyCalculationTime: metav1.Time{Time: time.Now()},
147+
RunningWorkloads: 3,
148+
ScheduleStartTime: metav1.Now(),
149+
TopologyCalculationTime: metav1.Now(),
149150
TopologyOrder: agv1alpha1.AppGroupTopologyList{
150151
agv1alpha1.AppGroupTopologyInfo{
151152
Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p1", Selector: "p1", APIVersion: "apps/v1", Namespace: "default"}, Index: 1},
@@ -221,8 +222,9 @@ func TestTopologicalSortPlugin(t *testing.T) {
221222
},
222223
},
223224
).Status(agv1alpha1.AppGroupStatus{
224-
RunningWorkloads: 3,
225-
ScheduleStartTime: metav1.Time{Time: time.Now()}, TopologyCalculationTime: metav1.Time{Time: time.Now()},
225+
RunningWorkloads: 3,
226+
ScheduleStartTime: metav1.Now(),
227+
TopologyCalculationTime: metav1.Now(),
226228
TopologyOrder: agv1alpha1.AppGroupTopologyList{
227229
agv1alpha1.AppGroupTopologyInfo{Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p1", Selector: "p1", APIVersion: "apps/v1", Namespace: "default"}, Index: 1},
228230
agv1alpha1.AppGroupTopologyInfo{Workload: agv1alpha1.AppGroupWorkloadInfo{Kind: "Deployment", Name: "p10", Selector: "p10", APIVersion: "apps/v1", Namespace: "default"}, Index: 2},

0 commit comments

Comments
 (0)