diff --git a/pkg/kubelet/kubelet_server_journal.go b/pkg/kubelet/kubelet_server_journal.go index bf3114519c6..58612457990 100644 --- a/pkg/kubelet/kubelet_server_journal.go +++ b/pkg/kubelet/kubelet_server_journal.go @@ -267,7 +267,7 @@ func (n *nodeLogQuery) Copy(w io.Writer) { // set the deadline to the maximum across both runs ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(30*time.Second)) defer cancel() - boot := int(0) + boot := 0 if n.Boot != nil { boot = *n.Boot } diff --git a/pkg/kubelet/pod_workers.go b/pkg/kubelet/pod_workers.go index 20e8b493a8f..df74e9f615e 100644 --- a/pkg/kubelet/pod_workers.go +++ b/pkg/kubelet/pod_workers.go @@ -1658,7 +1658,7 @@ func killPodNow(podWorkers PodWorkers, recorder record.EventRecorder) eviction.K // we timeout and return an error if we don't get a callback within a reasonable time. // the default timeout is relative to the grace period (we settle on 10s to wait for kubelet->runtime traffic to complete in sigkill) - timeout := int64(gracePeriod + (gracePeriod / 2)) + timeout := gracePeriod + (gracePeriod / 2) minTimeout := int64(10) if timeout < minTimeout { timeout = minTimeout diff --git a/pkg/kubelet/status/status_manager_test.go b/pkg/kubelet/status/status_manager_test.go index 23b9f17f76f..d5f9f4936c7 100644 --- a/pkg/kubelet/status/status_manager_test.go +++ b/pkg/kubelet/status/status_manager_test.go @@ -500,7 +500,7 @@ func TestStatusNormalizationEnforcesMaxBytes(t *testing.T) { Name: fmt.Sprintf("container%d", i), LastTerminationState: v1.ContainerState{ Terminated: &v1.ContainerStateTerminated{ - Message: strings.Repeat("abcdefgh", int(24+i%3)), + Message: strings.Repeat("abcdefgh", 24+i%3), }, }, } diff --git a/pkg/kubelet/types/pod_update_test.go b/pkg/kubelet/types/pod_update_test.go index 32100654363..41e32a8640e 100644 --- a/pkg/kubelet/types/pod_update_test.go +++ b/pkg/kubelet/types/pod_update_test.go @@ -27,7 +27,7 @@ import ( ) var ( - systemPriority = int32(scheduling.SystemCriticalPriority) + systemPriority = scheduling.SystemCriticalPriority systemPriorityUpper = systemPriority + 1000 )