github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #131800 from BenTheElder/kubelet-testing

Browse Source 
kubelet: don't import testing dependency in non-test code
This commit is contained in:
Kubernetes Prow Robot
2025-05-16 16:37:13 -07:00
committed by GitHub
parent 79cc5ddaa6 139fab0ebd
commit b6bff1bd44
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet_test.go
View File

@@ -307,7 +307,7 @@ func newTestKubeletWithImageList(
volumeStatsAggPeriod := time.Second * 10
kubelet.resourceAnalyzer = serverstats.NewResourceAnalyzer(kubelet, volumeStatsAggPeriod, kubelet.recorder)
fakeHostStatsProvider := stats.NewFakeHostStatsProvider()
fakeHostStatsProvider := stats.NewFakeHostStatsProvider(&containertest.FakeOS{})
kubelet.StatsProvider = stats.NewCadvisorStatsProvider(
kubelet.cadvisor,

14
pkg/kubelet/stats/cadvisor_stats_provider_test.go
View File

@@ -273,7 +273,7 @@ func TestCadvisorListPodStats(t *testing.T) {
resourceAnalyzer := &fakeResourceAnalyzer{podVolumeStats: volumeStats}
p := NewCadvisorStatsProvider(mockCadvisor, resourceAnalyzer, nil, nil, mockRuntime, mockStatus, NewFakeHostStatsProvider())
p := NewCadvisorStatsProvider(mockCadvisor, resourceAnalyzer, nil, nil, mockRuntime, mockStatus, NewFakeHostStatsProvider(&containertest.FakeOS{}))
pods, err := p.ListPodStats(ctx)
assert.NoError(t, err)
@@ -459,7 +459,7 @@ func TestCadvisorListPodCPUAndMemoryStats(t *testing.T) {
resourceAnalyzer := &fakeResourceAnalyzer{podVolumeStats: volumeStats}
p := NewCadvisorStatsProvider(mockCadvisor, resourceAnalyzer, nil, nil, nil, nil, NewFakeHostStatsProvider())
p := NewCadvisorStatsProvider(mockCadvisor, resourceAnalyzer, nil, nil, nil, nil, NewFakeHostStatsProvider(&containertest.FakeOS{}))
pods, err := p.ListPodCPUAndMemoryStats(ctx)
assert.NoError(t, err)
@@ -563,7 +563,7 @@ func TestCadvisorImagesFsStatsKubeletSeparateDiskOff(t *testing.T) {
mockCadvisor.EXPECT().ImagesFsInfo(ctx).Return(imageFsInfo, nil)
mockRuntime.EXPECT().ImageStats(ctx).Return(imageStats, nil)
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider())
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider(&containertest.FakeOS{}))
stats, _, err := provider.ImageFsStats(ctx)
assert.NoError(err)
@@ -644,7 +644,7 @@ func TestImageFsStatsCustomResponse(t *testing.T) {
mockCadvisor.EXPECT().ContainerFsInfo(ctx).Return(res, nil)
}
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider())
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider(&containertest.FakeOS{}))
stats, containerfs, err := provider.ImageFsStats(ctx)
if tc.shouldErr {
require.Error(t, err, desc)
@@ -681,7 +681,7 @@ func TestCadvisorImagesFsStats(t *testing.T) {
mockCadvisor.EXPECT().ImagesFsInfo(ctx).Return(imageFsInfo, nil)
mockRuntime.EXPECT().ImageFsInfo(ctx).Return(imageFsInfoResponse, nil)
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider())
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider(&containertest.FakeOS{}))
stats, containerfs, err := provider.ImageFsStats(ctx)
assert.NoError(err)
@@ -735,7 +735,7 @@ func TestCadvisorSplitImagesFsStats(t *testing.T) {
mockRuntime.EXPECT().ImageFsInfo(ctx).Return(imageFsInfoResponse, nil)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.KubeletSeparateDiskGC, true)
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider())
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider(&containertest.FakeOS{}))
stats, containerfs, err := provider.ImageFsStats(ctx)
assert.NoError(err)
@@ -788,7 +788,7 @@ func TestCadvisorSameDiskDifferentLocations(t *testing.T) {
mockRuntime.EXPECT().ImageFsInfo(ctx).Return(imageFsInfoResponse, nil)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.KubeletSeparateDiskGC, true)
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider())
provider := newCadvisorStatsProvider(mockCadvisor, &fakeResourceAnalyzer{}, mockRuntime, nil, NewFakeHostStatsProvider(&containertest.FakeOS{}))
stats, containerfs, err := provider.ImageFsStats(ctx)
require.NoError(t, err, "imageFsStats should have no error")

4
pkg/kubelet/stats/cri_stats_provider_test.go
View File

@@ -656,7 +656,7 @@ func TestCRIListPodCPUAndMemoryStats(t *testing.T) {
mockRuntimeCache,
fakeRuntimeService,
nil,
NewFakeHostStatsProvider(),
NewFakeHostStatsProvider(&kubecontainertest.FakeOS{}),
false,
)
@@ -791,7 +791,7 @@ func TestCRIImagesFsStats(t *testing.T) {
mockRuntimeCache,
fakeRuntimeService,
fakeImageService,
NewFakeHostStatsProvider(),
NewFakeHostStatsProvider(&kubecontainertest.FakeOS{}),
false,
)

5
pkg/kubelet/stats/host_stats_provider_fake.go
View File

@@ -24,7 +24,6 @@ import (
"k8s.io/apimachinery/pkg/types"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
kubecontainertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
"k8s.io/kubernetes/pkg/kubelet/kuberuntime"
"k8s.io/kubernetes/pkg/volume"
)
@@ -35,9 +34,9 @@ type fakeHostStatsProvider struct {
}
// NewFakeHostStatsProvider provides a way to test with fake host statistics
func NewFakeHostStatsProvider() HostStatsProvider {
func NewFakeHostStatsProvider(osInterface kubecontainer.OSInterface) HostStatsProvider {
return &fakeHostStatsProvider{
osInterface: &kubecontainertest.FakeOS{},
osInterface: osInterface,
}
}