diff --git a/pkg/kubelet/kubelet_server_journal.go b/pkg/kubelet/kubelet_server_journal.go index 58612457990..90e55b20827 100644 --- a/pkg/kubelet/kubelet_server_journal.go +++ b/pkg/kubelet/kubelet_server_journal.go @@ -354,7 +354,7 @@ func copyFileLogs(ctx context.Context, w io.Writer, services []string) { // in that order stopping on first success. func heuristicsCopyFileLogs(ctx context.Context, w io.Writer, service string) { logFileNames := [3]string{ - fmt.Sprintf("%s", service), + service, fmt.Sprintf("%s.log", service), fmt.Sprintf("%s/%s.log", service, service), } diff --git a/test/e2e/node/pod_resize.go b/test/e2e/node/pod_resize.go index c45e9ad60b9..a26d3e2715e 100644 --- a/test/e2e/node/pod_resize.go +++ b/test/e2e/node/pod_resize.go @@ -429,7 +429,7 @@ func waitForPodResizeActuation(c clientset.Interface, podClient *e2epod.PodClien if err != nil { return nil, err } - if verifyPodAllocations(pod, expectedContainers, false) == false { + if !verifyPodAllocations(pod, expectedContainers, false) { continue } return pod, nil @@ -438,7 +438,7 @@ func waitForPodResizeActuation(c clientset.Interface, podClient *e2epod.PodClien } waitContainerCgroupValuesEqualsExpected := func() error { for start := time.Now(); time.Since(start) < PollTimeout; time.Sleep(PollInterval) { - if verifyPodContainersCgroupValues(patchedPod, expectedContainers, false) == false { + if !verifyPodContainersCgroupValues(patchedPod, expectedContainers, false) { continue } return nil diff --git a/test/e2e/windows/kubelet_stats.go b/test/e2e/windows/kubelet_stats.go index 8c93c177fb5..1acdbc14b77 100644 --- a/test/e2e/windows/kubelet_stats.go +++ b/test/e2e/windows/kubelet_stats.go @@ -226,7 +226,7 @@ func findWindowsNode(ctx context.Context, f *framework.Framework) (v1.Node, erro } } - if foundNode == false { + if !foundNode { e2eskipper.Skipf("Could not find and ready and schedulable Windows nodes") }