From c3a4c26001ec1e9b28912ebc9af35b2b8aa22d04 Mon Sep 17 00:00:00 2001 From: chaunceyjiang Date: Tue, 20 Jun 2023 12:22:48 +0800 Subject: [PATCH] fix aggregateCronJobStatus panic Signed-off-by: chaunceyjiang --- pkg/resourceinterpreter/default/native/aggregatestatus.go | 4 ++-- .../default/native/aggregatestatus_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/resourceinterpreter/default/native/aggregatestatus.go b/pkg/resourceinterpreter/default/native/aggregatestatus.go index 6ef82a692..f05abadb1 100644 --- a/pkg/resourceinterpreter/default/native/aggregatestatus.go +++ b/pkg/resourceinterpreter/default/native/aggregatestatus.go @@ -214,8 +214,8 @@ func aggregateCronJobStatus(object *unstructured.Unstructured, aggregatedStatusI if err = json.Unmarshal(item.Status.Raw, temp); err != nil { return nil, err } - klog.V(3).Infof("Grab cronJob(%s/%s) status from cluster(%s), active: %+v, lastScheduleTime: %s, lastSuccessfulTime: %s", - cronjob.Namespace, cronjob.Name, item.ClusterName, temp.Active, temp.LastScheduleTime.String(), temp.LastSuccessfulTime.String()) + klog.V(3).Infof("Grab cronJob(%s/%s) status from cluster(%s), active: %+v, lastScheduleTime: %+v, lastSuccessfulTime: %+v", + cronjob.Namespace, cronjob.Name, item.ClusterName, temp.Active, temp.LastScheduleTime, temp.LastSuccessfulTime) newStatus.Active = append(newStatus.Active, temp.Active...) if newStatus.LastScheduleTime == nil { newStatus.LastScheduleTime = temp.LastScheduleTime diff --git a/pkg/resourceinterpreter/default/native/aggregatestatus_test.go b/pkg/resourceinterpreter/default/native/aggregatestatus_test.go index 52ed8bb15..27ca64f44 100644 --- a/pkg/resourceinterpreter/default/native/aggregatestatus_test.go +++ b/pkg/resourceinterpreter/default/native/aggregatestatus_test.go @@ -995,7 +995,7 @@ func Test_aggregateCronJobStatus(t *testing.T) { }, }, "lastScheduleTime": "2023-02-08T07:16:00Z", - "lastSuccessfulTime": "2023-02-08T07:15:00Z", + "lastSuccessfulTime": nil, }) cronjobStatusRaw2, _ := helper.BuildStatusRawExtension(map[string]interface{}{ "active": []corev1.ObjectReference{