Skip to content

K
k3s
Commit 9c8287d6 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45624 from dashpole/kubelet_cleanup

Automatic merge from submit-queue (batch tested with PRs 45685, 45572, 45624, 45723, 45733) Remove unused fields from Kubelet struct Just a small attempt to clean up some unused fields in the kubelet struct. This doesn't make any actual code changes. /assign @mtaufen
parents debced74 b69dacbd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 123 deletions
pkg/kubelet/kubelet_test.go
View file @ 9c8287d6
...@@ -162,7 +162,7 @@ func newTestKubeletWithImageList( ...@@ -162,7 +162,7 @@ func newTestKubeletWithImageList(
kubelet.nodeName = types.NodeName(testKubeletHostname) kubelet.nodeName = types.NodeName(testKubeletHostname)
kubelet.runtimeState = newRuntimeState(maxWaitForContainerRuntime) kubelet.runtimeState = newRuntimeState(maxWaitForContainerRuntime)
kubelet.runtimeState.setNetworkState(nil) kubelet.runtimeState.setNetworkState(nil)
kubelet.networkPlugin, _ = network.InitNetworkPlugin([]network.NetworkPlugin{}, "", nettest.NewFakeHost(nil), componentconfig.HairpinNone, kubelet.nonMasqueradeCIDR, 1440) kubelet.networkPlugin, _ = network.InitNetworkPlugin([]network.NetworkPlugin{}, "", nettest.NewFakeHost(nil), componentconfig.HairpinNone, "", 1440)
if tempDir, err := ioutil.TempDir("/tmp", "kubelet_test."); err != nil { if tempDir, err := ioutil.TempDir("/tmp", "kubelet_test."); err != nil {
t.Fatalf("can't make a temp rootdir: %v", err) t.Fatalf("can't make a temp rootdir: %v", err)
} else { } else {
...@@ -174,7 +174,6 @@ func newTestKubeletWithImageList( ...@@ -174,7 +174,6 @@ func newTestKubeletWithImageList(
kubelet.sourcesReady = config.NewSourcesReady(func(_ sets.String) bool { return true }) kubelet.sourcesReady = config.NewSourcesReady(func(_ sets.String) bool { return true })
kubelet.masterServiceNamespace = metav1.NamespaceDefault kubelet.masterServiceNamespace = metav1.NamespaceDefault
kubelet.serviceLister = testServiceLister{} kubelet.serviceLister = testServiceLister{}
kubelet.nodeLister = testNodeLister{}
kubelet.nodeInfo = testNodeInfo{ kubelet.nodeInfo = testNodeInfo{
nodes: []*v1.Node{ nodes: []*v1.Node{
{ {
...@@ -214,7 +213,6 @@ func newTestKubeletWithImageList( ...@@ -214,7 +213,6 @@ func newTestKubeletWithImageList(
kubelet.secretManager = secretManager kubelet.secretManager = secretManager
kubelet.podManager = kubepod.NewBasicPodManager(fakeMirrorClient, kubelet.secretManager) kubelet.podManager = kubepod.NewBasicPodManager(fakeMirrorClient, kubelet.secretManager)
kubelet.statusManager = status.NewManager(fakeKubeClient, kubelet.podManager, &statustest.FakePodDeletionSafetyProvider{}) kubelet.statusManager = status.NewManager(fakeKubeClient, kubelet.podManager, &statustest.FakePodDeletionSafetyProvider{})
kubelet.containerRefManager = kubecontainer.NewRefManager()
diskSpaceManager, err := newDiskSpaceManager(mockCadvisor, DiskSpacePolicy{}) diskSpaceManager, err := newDiskSpaceManager(mockCadvisor, DiskSpacePolicy{})
if err != nil { if err != nil {
t.Fatalf("can't initialize disk space manager: %v", err) t.Fatalf("can't initialize disk space manager: %v", err)
...@@ -459,16 +457,6 @@ func TestHandlePortConflicts(t *testing.T) { ...@@ -459,16 +457,6 @@ func TestHandlePortConflicts(t *testing.T) {
testKubelet.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil) testKubelet.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
testKubelet.fakeCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{}, nil) testKubelet.fakeCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
kl.nodeLister = testNodeLister{nodes: []*v1.Node{
{
ObjectMeta: metav1.ObjectMeta{Name: string(kl.nodeName)},
Status: v1.NodeStatus{
Allocatable: v1.ResourceList{
v1.ResourcePods: *resource.NewQuantity(110, resource.DecimalSI),
},
},
},
}}
kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{ kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{
{ {
ObjectMeta: metav1.ObjectMeta{Name: string(kl.nodeName)}, ObjectMeta: metav1.ObjectMeta{Name: string(kl.nodeName)},
...@@ -514,16 +502,6 @@ func TestHandleHostNameConflicts(t *testing.T) { ...@@ -514,16 +502,6 @@ func TestHandleHostNameConflicts(t *testing.T) {
testKubelet.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil) testKubelet.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
testKubelet.fakeCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{}, nil) testKubelet.fakeCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
kl.nodeLister = testNodeLister{nodes: []*v1.Node{
{
ObjectMeta: metav1.ObjectMeta{Name: "127.0.0.1"},
Status: v1.NodeStatus{
Allocatable: v1.ResourceList{
v1.ResourcePods: *resource.NewQuantity(110, resource.DecimalSI),
},
},
},
}}
kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{ kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{
{ {
ObjectMeta: metav1.ObjectMeta{Name: "127.0.0.1"}, ObjectMeta: metav1.ObjectMeta{Name: "127.0.0.1"},
...@@ -572,7 +550,6 @@ func TestHandleNodeSelector(t *testing.T) { ...@@ -572,7 +550,6 @@ func TestHandleNodeSelector(t *testing.T) {
}, },
}, },
} }
kl.nodeLister = testNodeLister{nodes: nodes}
kl.nodeInfo = testNodeInfo{nodes: nodes} kl.nodeInfo = testNodeInfo{nodes: nodes}
testKubelet.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{}, nil) testKubelet.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{}, nil)
testKubelet.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil) testKubelet.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
...@@ -611,7 +588,6 @@ func TestHandleMemExceeded(t *testing.T) { ...@@ -611,7 +588,6 @@ func TestHandleMemExceeded(t *testing.T) {
v1.ResourcePods: *resource.NewQuantity(40, resource.DecimalSI), v1.ResourcePods: *resource.NewQuantity(40, resource.DecimalSI),
}}}, }}},
} }
kl.nodeLister = testNodeLister{nodes: nodes}
kl.nodeInfo = testNodeInfo{nodes: nodes} kl.nodeInfo = testNodeInfo{nodes: nodes}
testKubelet.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{}, nil) testKubelet.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{}, nil)
testKubelet.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil) testKubelet.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
...@@ -1850,16 +1826,6 @@ func TestHandlePodAdditionsInvokesPodAdmitHandlers(t *testing.T) { ...@@ -1850,16 +1826,6 @@ func TestHandlePodAdditionsInvokesPodAdmitHandlers(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup() defer testKubelet.Cleanup()
kl := testKubelet.kubelet kl := testKubelet.kubelet
kl.nodeLister = testNodeLister{nodes: []*v1.Node{
{
ObjectMeta: metav1.ObjectMeta{Name: string(kl.nodeName)},
Status: v1.NodeStatus{
Allocatable: v1.ResourceList{
v1.ResourcePods: *resource.NewQuantity(110, resource.DecimalSI),
},
},
},
}}
kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{ kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{
{ {
ObjectMeta: metav1.ObjectMeta{Name: string(kl.nodeName)}, ObjectMeta: metav1.ObjectMeta{Name: string(kl.nodeName)},
......
pkg/kubelet/runonce_test.go
View file @ 9c8287d6
...@@ -73,23 +73,21 @@ func TestRunOnce(t *testing.T) { ...@@ -73,23 +73,21 @@ func TestRunOnce(t *testing.T) {
} }
defer os.RemoveAll(basePath) defer os.RemoveAll(basePath)
kb := &Kubelet{ kb := &Kubelet{
rootDirectory: basePath, rootDirectory: basePath,
recorder: &record.FakeRecorder{}, recorder: &record.FakeRecorder{},
cadvisor: cadvisor, cadvisor: cadvisor,
nodeLister: testNodeLister{}, nodeInfo: testNodeInfo{},
nodeInfo: testNodeInfo{}, statusManager: status.NewManager(nil, podManager, &statustest.FakePodDeletionSafetyProvider{}),
statusManager: status.NewManager(nil, podManager, &statustest.FakePodDeletionSafetyProvider{}), podManager: podManager,
containerRefManager: kubecontainer.NewRefManager(), os: &containertest.FakeOS{},
podManager: podManager, diskSpaceManager: diskSpaceManager,
os: &containertest.FakeOS{}, containerRuntime: fakeRuntime,
diskSpaceManager: diskSpaceManager, reasonCache: NewReasonCache(),
containerRuntime: fakeRuntime, clock: clock.RealClock{},
reasonCache: NewReasonCache(), kubeClient: &fake.Clientset{},
clock: clock.RealClock{}, hostname: testKubeletHostname,
kubeClient: &fake.Clientset{}, nodeName: testKubeletHostname,
hostname: testKubeletHostname, runtimeState: newRuntimeState(time.Second),
nodeName: testKubeletHostname,
runtimeState: newRuntimeState(time.Second),
} }
kb.containerManager = cm.NewStubContainerManager() kb.containerManager = cm.NewStubContainerManager()
...@@ -113,7 +111,7 @@ func TestRunOnce(t *testing.T) { ...@@ -113,7 +111,7 @@ func TestRunOnce(t *testing.T) {
false, /* experimentalCheckNodeCapabilitiesBeforeMount */ false, /* experimentalCheckNodeCapabilitiesBeforeMount */
false /* keepTerminatedPodVolumes */) false /* keepTerminatedPodVolumes */)
kb.networkPlugin, _ = network.InitNetworkPlugin([]network.NetworkPlugin{}, "", nettest.NewFakeHost(nil), componentconfig.HairpinNone, kb.nonMasqueradeCIDR, network.UseDefaultMTU) kb.networkPlugin, _ = network.InitNetworkPlugin([]network.NetworkPlugin{}, "", nettest.NewFakeHost(nil), componentconfig.HairpinNone, "", network.UseDefaultMTU)
// TODO: Factor out "StatsProvider" from Kubelet so we don't have a cyclic dependency // TODO: Factor out "StatsProvider" from Kubelet so we don't have a cyclic dependency
volumeStatsAggPeriod := time.Second * 10 volumeStatsAggPeriod := time.Second * 10
kb.resourceAnalyzer = stats.NewResourceAnalyzer(kb, volumeStatsAggPeriod, kb.containerRuntime) kb.resourceAnalyzer = stats.NewResourceAnalyzer(kb, volumeStatsAggPeriod, kb.containerRuntime)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment