From 1d822f1dc8090b18b3c7fe535b8781f96bd82949 Mon Sep 17 00:00:00 2001 From: Tim Allclair Date: Fri, 8 Nov 2024 06:48:50 -0800 Subject: [PATCH] Fix linter errors --- pkg/kubelet/kuberuntime/kuberuntime_manager.go | 4 ++-- pkg/kubelet/kuberuntime/kuberuntime_manager_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index 83f12b8fedb..6f96a3e2895 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -672,7 +672,7 @@ func (m *kubeGenericRuntimeManager) doPodResizeAction(pod *v1.Pod, podStatus *ku podResources := cm.ResourceConfigForPod(pod, m.cpuCFSQuota, uint64((m.cpuCFSQuotaPeriod.Duration)/time.Microsecond), false) if podResources == nil { klog.ErrorS(nil, "Unable to get resource configuration", "pod", pod.Name) - result.Fail(fmt.Errorf("Unable to get resource configuration processing resize for pod %s", pod.Name)) + result.Fail(fmt.Errorf("unable to get resource configuration processing resize for pod %s", pod.Name)) return } setPodCgroupConfig := func(rName v1.ResourceName, setLimitValue bool) error { @@ -751,7 +751,7 @@ func (m *kubeGenericRuntimeManager) doPodResizeAction(pod *v1.Pod, podStatus *ku } if currentPodMemoryUsage >= uint64(*podResources.Memory) { klog.ErrorS(nil, "Aborting attempt to set pod memory limit less than current memory usage", "pod", pod.Name) - result.Fail(fmt.Errorf("Aborting attempt to set pod memory limit less than current memory usage for pod %s", pod.Name)) + result.Fail(fmt.Errorf("aborting attempt to set pod memory limit less than current memory usage for pod %s", pod.Name)) return } if errResize := resizeContainers(v1.ResourceMemory, int64(*currentPodMemoryConfig.Memory), *podResources.Memory, 0, 0); errResize != nil { diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go index 90f8a4d948f..9baaf1a3608 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go @@ -2685,7 +2685,7 @@ func TestUpdatePodContainerResources(t *testing.T) { } fakeRuntime.Called = []string{} err := m.updatePodContainerResources(pod, tc.resourceName, containersToUpdate) - assert.NoError(t, err, dsc) + require.NoError(t, err, dsc) if tc.invokeUpdateResources { assert.Contains(t, fakeRuntime.Called, "UpdateContainerResources", dsc)