Skip to content

Commit a4739df

Browse files
authored
Merge pull request kubernetes#130790 from natasha41575/drop_fake_status_manager
remove kubelet fake status manager
2 parents dabb4e2 + 7848744 commit a4739df

File tree

3 files changed

+0
-85
lines changed

3 files changed

+0
-85
lines changed

pkg/kubelet/kubelet_pods_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ import (
5656
"k8s.io/kubernetes/pkg/kubelet/metrics"
5757
"k8s.io/kubernetes/pkg/kubelet/prober/results"
5858
"k8s.io/kubernetes/pkg/kubelet/secret"
59-
"k8s.io/kubernetes/pkg/kubelet/status"
6059
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
6160
netutils "k8s.io/utils/net"
6261
"k8s.io/utils/ptr"
@@ -3925,7 +3924,6 @@ func Test_generateAPIPodStatusForInPlaceVPAEnabled(t *testing.T) {
39253924
kl := testKubelet.kubelet
39263925

39273926
oldStatus := test.pod.Status
3928-
kl.statusManager = status.NewFakeManager()
39293927
kl.statusManager.SetPodStatus(test.pod, oldStatus)
39303928
actual := kl.generateAPIPodStatus(test.pod, &testKubecontainerPodStatus /* criStatus */, false /* test.isPodTerminal */)
39313929

@@ -4727,7 +4725,6 @@ func TestConvertToAPIContainerStatusesForResources(t *testing.T) {
47274725
testKubelet := newTestKubelet(t, false)
47284726
defer testKubelet.Cleanup()
47294727
kubelet := testKubelet.kubelet
4730-
kubelet.statusManager = status.NewFakeManager()
47314728

47324729
idx := 0
47334730
for tdesc, tc := range map[string]struct {
@@ -5181,7 +5178,6 @@ func TestConvertToAPIContainerStatusesForUser(t *testing.T) {
51815178
testKubelet := newTestKubelet(t, false)
51825179
defer testKubelet.Cleanup()
51835180
kubelet := testKubelet.kubelet
5184-
kubelet.statusManager = status.NewFakeManager()
51855181

51865182
for tdesc, tc := range map[string]struct {
51875183
testPodStatus *kubecontainer.PodStatus

pkg/kubelet/kubelet_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -2403,7 +2403,6 @@ func TestPodResourceAllocationReset(t *testing.T) {
24032403
testKubelet := newTestKubelet(t, false)
24042404
defer testKubelet.Cleanup()
24052405
kubelet := testKubelet.kubelet
2406-
kubelet.statusManager = status.NewFakeManager()
24072406

24082407
// fakePodWorkers trigger syncPodFn synchronously on update, but entering
24092408
// kubelet.SyncPod while holding the podResizeMutex can lead to deadlock.
@@ -2837,8 +2836,6 @@ func TestHandlePodResourcesResize(t *testing.T) {
28372836
for _, tt := range tests {
28382837
for _, isSidecarContainer := range []bool{false, true} {
28392838
t.Run(fmt.Sprintf("%s/sidecar=%t", tt.name, isSidecarContainer), func(t *testing.T) {
2840-
kubelet.statusManager = status.NewFakeManager()
2841-
28422839
var originalPod *v1.Pod
28432840
var originalCtr *v1.Container
28442841
if isSidecarContainer {

pkg/kubelet/status/fake_status_manager.go

-78
This file was deleted.

0 commit comments

Comments
 (0)