github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix tests after rebase

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2024-02-16 16:02:10 -08:00
parent 5fcbc9d2fc
commit ae0a813be1
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/kubelet_test.go
View File

@ -3201,6 +3201,7 @@ func TestSyncPodSpans(t *testing.T) {
kubelet.readinessManager, kubelet.readinessManager,
kubelet.startupManager, kubelet.startupManager,
kubelet.rootDirectory, kubelet.rootDirectory,
kubelet.podLogsDirectory,
kubelet.machineInfo, kubelet.machineInfo,
kubelet.podWorkers, kubelet.podWorkers,
kubelet.os, kubelet.os,

2
pkg/kubelet/kuberuntime/kuberuntime_gc.go
View File

@ -332,7 +332,7 @@ func (cgc *containerGC) evictPodLogsDirectories(ctx context.Context, allSourcesR
// Only remove pod logs directories when all sources are ready. // Only remove pod logs directories when all sources are ready.
dirs, err := osInterface.ReadDir(podLogsDirectory) dirs, err := osInterface.ReadDir(podLogsDirectory)
if err != nil { 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 { for _, dir := range dirs {
name := dir.Name() name := dir.Name()

2
pkg/kubelet/stats/cri_stats_provider_windows_test.go
View File

@ -455,7 +455,7 @@ func Test_criStatsProvider_makeWinContainerStats(t *testing.T) {
InodesUsed: resource.NewQuantity(int64(logStatsInodesUsed), resource.BinarySI), InodesUsed: resource.NewQuantity(int64(logStatsInodesUsed), resource.BinarySI),
} }
fakeStats := map[string]*volume.Metrics{ 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{} fakeOS := &kubecontainertest.FakeOS{}
fakeHostStatsProvider := NewFakeHostStatsProviderWithData(fakeStats, fakeOS) fakeHostStatsProvider := NewFakeHostStatsProviderWithData(fakeStats, fakeOS)