diff options
| -rw-r--r-- | cloud/pkg/taskmanager/imageprepullcontroller/image_prepull_task.go | 5 | ||||
| -rw-r--r-- | cloud/pkg/taskmanager/nodeupgradecontroller/upgrade_task.go | 5 | ||||
| -rw-r--r-- | cloud/pkg/taskmanager/util/util.go | 4 | ||||
| -rw-r--r-- | common/constants/default.go | 2 | ||||
| -rw-r--r-- | edge/pkg/devicetwin/dtmanager/device.go | 3 | ||||
| -rw-r--r-- | keadm/cmd/keadm/app/cmd/util/common.go | 2 | ||||
| -rw-r--r-- | staging/src/github.com/kubeedge/api/apis/common/constants/default.go | 2 |
7 files changed, 7 insertions, 16 deletions
diff --git a/cloud/pkg/taskmanager/imageprepullcontroller/image_prepull_task.go b/cloud/pkg/taskmanager/imageprepullcontroller/image_prepull_task.go index aedd8fe08..dcf8988a1 100644 --- a/cloud/pkg/taskmanager/imageprepullcontroller/image_prepull_task.go +++ b/cloud/pkg/taskmanager/imageprepullcontroller/image_prepull_task.go @@ -27,7 +27,6 @@ import ( v1alpha12 "github.com/kubeedge/api/apis/fsm/v1alpha1" "github.com/kubeedge/api/apis/operations/v1alpha1" "github.com/kubeedge/kubeedge/cloud/pkg/common/client" - "github.com/kubeedge/kubeedge/cloud/pkg/taskmanager/util" "github.com/kubeedge/kubeedge/pkg/util/fsm" ) @@ -71,7 +70,7 @@ func updatePrePullNodeState(id, nodeName string, state v1alpha12.State, event fs State: state, Event: event.Type, Action: event.Action, - Time: time.Now().Format(util.ISO8601UTC), + Time: time.Now().UTC().Format(time.RFC3339), Reason: event.Msg, }, ImageStatus: imagesStatus, @@ -122,7 +121,7 @@ func updateUpgradeTaskState(id, _ string, state v1alpha12.State, event fsm.Event status.Action = event.Action status.Reason = event.Msg status.State = state - status.Time = time.Now().Format(util.ISO8601UTC) + status.Time = time.Now().UTC().Format(time.RFC3339) err := patchStatus(newTask, *status, client.GetCRDClient()) diff --git a/cloud/pkg/taskmanager/nodeupgradecontroller/upgrade_task.go b/cloud/pkg/taskmanager/nodeupgradecontroller/upgrade_task.go index 14f8873c9..ab269e744 100644 --- a/cloud/pkg/taskmanager/nodeupgradecontroller/upgrade_task.go +++ b/cloud/pkg/taskmanager/nodeupgradecontroller/upgrade_task.go @@ -24,7 +24,6 @@ import ( v1alpha12 "github.com/kubeedge/api/apis/fsm/v1alpha1" "github.com/kubeedge/api/apis/operations/v1alpha1" "github.com/kubeedge/kubeedge/cloud/pkg/common/client" - "github.com/kubeedge/kubeedge/cloud/pkg/taskmanager/util" "github.com/kubeedge/kubeedge/pkg/util/fsm" ) @@ -62,7 +61,7 @@ func updateUpgradeNodeState(id, nodeName string, state v1alpha12.State, event fs State: state, Event: event.Type, Action: event.Action, - Time: time.Now().Format(util.ISO8601UTC), + Time: time.Now().UTC().Format(time.RFC3339), Reason: event.Msg, } break @@ -111,7 +110,7 @@ func updateUpgradeTaskState(id, _ string, state v1alpha12.State, event fsm.Event status.Action = event.Action status.Reason = event.Msg status.State = state - status.Time = time.Now().Format(util.ISO8601UTC) + status.Time = time.Now().UTC().Format(time.RFC3339) err := patchStatus(newTask, *status, client.GetCRDClient()) diff --git a/cloud/pkg/taskmanager/util/util.go b/cloud/pkg/taskmanager/util/util.go index e998047a5..400c48b67 100644 --- a/cloud/pkg/taskmanager/util/util.go +++ b/cloud/pkg/taskmanager/util/util.go @@ -22,7 +22,7 @@ import ( "github.com/distribution/distribution/v3/reference" metav1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" versionutil "k8s.io/apimachinery/pkg/util/version" "k8s.io/klog/v2" @@ -41,8 +41,6 @@ const ( TaskRollback = "rollback" TaskBackup = "backup" TaskPrePull = "prepull" - - ISO8601UTC = "2006-01-02T15:04:05Z" ) type TaskMessage struct { diff --git a/common/constants/default.go b/common/constants/default.go index d0820fefd..216e721ac 100644 --- a/common/constants/default.go +++ b/common/constants/default.go @@ -174,5 +174,3 @@ const ( // DeviceTwin DefaultDMISockPath = "/etc/kubeedge/dmi.sock" ) - -const ISO8601UTC = "2006-01-02T15:04:05Z" diff --git a/edge/pkg/devicetwin/dtmanager/device.go b/edge/pkg/devicetwin/dtmanager/device.go index fe374de8c..355908d95 100644 --- a/edge/pkg/devicetwin/dtmanager/device.go +++ b/edge/pkg/devicetwin/dtmanager/device.go @@ -10,7 +10,6 @@ import ( "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" - common "github.com/kubeedge/kubeedge/common/constants" messagepkg "github.com/kubeedge/kubeedge/edge/pkg/common/message" "github.com/kubeedge/kubeedge/edge/pkg/common/modules" "github.com/kubeedge/kubeedge/edge/pkg/devicetwin/dtclient" @@ -99,7 +98,7 @@ func dealDeviceStateUpdate(context *dtcontext.DTContext, resource string, msg in } var lastOnline string if state == dtcommon.DeviceStatusOnline || state == dtcommon.DeviceStatusOK { - lastOnline = time.Now().Format(common.ISO8601UTC) + lastOnline = time.Now().UTC().Format(time.RFC3339) } for i := 1; i <= dtcommon.RetryTimes; i++ { err = dtclient.UpdateDeviceFields( diff --git a/keadm/cmd/keadm/app/cmd/util/common.go b/keadm/cmd/keadm/app/cmd/util/common.go index 5944f62e9..754588419 100644 --- a/keadm/cmd/keadm/app/cmd/util/common.go +++ b/keadm/cmd/keadm/app/cmd/util/common.go @@ -653,7 +653,7 @@ func ReportTaskResult(config *v1alpha2.EdgeCoreConfig, taskType, taskID string, NodeName: config.Modules.Edged.HostnameOverride, Event: event.Type, Action: event.Action, - Time: time.Now().Format(constants.ISO8601UTC), + Time: time.Now().UTC().Format(time.RFC3339), Reason: event.Msg, } edgeHub := config.Modules.EdgeHub diff --git a/staging/src/github.com/kubeedge/api/apis/common/constants/default.go b/staging/src/github.com/kubeedge/api/apis/common/constants/default.go index d0820fefd..216e721ac 100644 --- a/staging/src/github.com/kubeedge/api/apis/common/constants/default.go +++ b/staging/src/github.com/kubeedge/api/apis/common/constants/default.go @@ -174,5 +174,3 @@ const ( // DeviceTwin DefaultDMISockPath = "/etc/kubeedge/dmi.sock" ) - -const ISO8601UTC = "2006-01-02T15:04:05Z" |