diff --git a/pkg/kubelet/dockershim/docker_image_linux.go b/pkg/kubelet/dockershim/docker_image_linux.go index 0762d26334c..ffaad085f99 100644 --- a/pkg/kubelet/dockershim/docker_image_linux.go +++ b/pkg/kubelet/dockershim/docker_image_linux.go @@ -20,8 +20,8 @@ package dockershim import ( "context" - "path/filepath" "os" + "path/filepath" "time" "k8s.io/klog" @@ -44,7 +44,7 @@ func (ds *dockerService) ImageFsInfo(_ context.Context, r *runtimeapi.ImageFsInf return &runtimeapi.ImageFsInfoResponse{ ImageFilesystems: []*runtimeapi.FilesystemUsage{ - &runtimeapi.FilesystemUsage{ + { Timestamp: time.Now().Unix(), FsId: &runtimeapi.FilesystemIdentifier{ Mountpoint: info.DockerRootDir, diff --git a/pkg/kubelet/dockershim/docker_stats_linux.go b/pkg/kubelet/dockershim/docker_stats_linux.go index d0f3cd463c0..bb53c13e3ad 100644 --- a/pkg/kubelet/dockershim/docker_stats_linux.go +++ b/pkg/kubelet/dockershim/docker_stats_linux.go @@ -95,7 +95,7 @@ func (ds *dockerService) getContainerStats(containerID string) (*runtimeapi.Cont Annotations: status.Annotations, }, Cpu: &runtimeapi.CpuUsage{ - Timestamp: timestamp, + Timestamp: timestamp, UsageCoreNanoSeconds: &runtimeapi.UInt64Value{Value: dockerStats.CPUStats.CPUUsage.TotalUsage}, }, Memory: &runtimeapi.MemoryUsage{