From ae0a813be107301886cf8a5378573174b612368b Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Fri, 16 Feb 2024 16:02:10 -0800 Subject: [PATCH] Fix tests after rebase Signed-off-by: Maksym Pavlenko --- pkg/kubelet/kubelet_test.go | 1 + pkg/kubelet/kuberuntime/kuberuntime_gc.go | 2 +- pkg/kubelet/stats/cri_stats_provider_windows_test.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 878e55eaba0..22084b65632 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -3201,6 +3201,7 @@ func TestSyncPodSpans(t *testing.T) { kubelet.readinessManager, kubelet.startupManager, kubelet.rootDirectory, + kubelet.podLogsDirectory, kubelet.machineInfo, kubelet.podWorkers, kubelet.os, diff --git a/pkg/kubelet/kuberuntime/kuberuntime_gc.go b/pkg/kubelet/kuberuntime/kuberuntime_gc.go index 89032de04a4..c6f8856213e 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_gc.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_gc.go @@ -332,7 +332,7 @@ func (cgc *containerGC) evictPodLogsDirectories(ctx context.Context, allSourcesR // Only remove pod logs directories when all sources are ready. dirs, err := osInterface.ReadDir(podLogsDirectory) if err != nil { - return fmt.Errorf("failed to read podLogsDirectory %q: %v", podLogsDirectory, err) + return fmt.Errorf("failed to read podLogsDirectory %q: %w", podLogsDirectory, err) } for _, dir := range dirs { name := dir.Name() diff --git a/pkg/kubelet/stats/cri_stats_provider_windows_test.go b/pkg/kubelet/stats/cri_stats_provider_windows_test.go index 52ec78baf72..ee90cefdcf8 100644 --- a/pkg/kubelet/stats/cri_stats_provider_windows_test.go +++ b/pkg/kubelet/stats/cri_stats_provider_windows_test.go @@ -455,7 +455,7 @@ func Test_criStatsProvider_makeWinContainerStats(t *testing.T) { InodesUsed: resource.NewQuantity(int64(logStatsInodesUsed), resource.BinarySI), } fakeStats := map[string]*volume.Metrics{ - kuberuntime.BuildContainerLogsDirectory("sb0-ns", "sb0-name", types.UID("sb0-uid"), "c0"): c0LogStats, + kuberuntime.BuildContainerLogsDirectory(testPodLogDirectory, "sb0-ns", "sb0-name", types.UID("sb0-uid"), "c0"): c0LogStats, } fakeOS := &kubecontainertest.FakeOS{} fakeHostStatsProvider := NewFakeHostStatsProviderWithData(fakeStats, fakeOS)