karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3683 from chaunceyjiang/cronjob 

fix panic when printing log when lastSuccessfulTime of cronjob is nil
This commit is contained in:
karmada-bot 2023-06-20 14:26:47 +08:00 committed by GitHub
parent b05784ecd2 c3a4c26001
commit 1791270cbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/resourceinterpreter/default/native/aggregatestatus.go
View File

@ -214,8 +214,8 @@ func aggregateCronJobStatus(object *unstructured.Unstructured, aggregatedStatusI
if err = json.Unmarshal(item.Status.Raw, temp); err != nil { if err = json.Unmarshal(item.Status.Raw, temp); err != nil {
return nil, err return nil, err
} }
klog.V(3).Infof("Grab cronJob(%s/%s) status from cluster(%s), active: %+v, lastScheduleTime: %s, lastSuccessfulTime: %s", 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.String(), temp.LastSuccessfulTime.String()) cronjob.Namespace, cronjob.Name, item.ClusterName, temp.Active, temp.LastScheduleTime, temp.LastSuccessfulTime)
newStatus.Active = append(newStatus.Active, temp.Active...) newStatus.Active = append(newStatus.Active, temp.Active...)
if newStatus.LastScheduleTime == nil { if newStatus.LastScheduleTime == nil {
newStatus.LastScheduleTime = temp.LastScheduleTime newStatus.LastScheduleTime = temp.LastScheduleTime

2
pkg/resourceinterpreter/default/native/aggregatestatus_test.go
View File

@ -995,7 +995,7 @@ func Test_aggregateCronJobStatus(t *testing.T) {
}, },
}, },
"lastScheduleTime": "2023-02-08T07:16:00Z", "lastScheduleTime": "2023-02-08T07:16:00Z",
"lastSuccessfulTime": "2023-02-08T07:15:00Z", "lastSuccessfulTime": nil,
}) })
cronjobStatusRaw2, _ := helper.BuildStatusRawExtension(map[string]interface{}{ cronjobStatusRaw2, _ := helper.BuildStatusRawExtension(map[string]interface{}{
"active": []corev1.ObjectReference{ "active": []corev1.ObjectReference{