diff --git a/pkg/kubelet/allocation/allocation_manager.go b/pkg/kubelet/allocation/allocation_manager.go index 7a069c50325..53cb71bda4f 100644 --- a/pkg/kubelet/allocation/allocation_manager.go +++ b/pkg/kubelet/allocation/allocation_manager.go @@ -20,6 +20,7 @@ import ( v1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/klog/v2" podutil "k8s.io/kubernetes/pkg/api/v1/pod" @@ -44,10 +45,10 @@ type Manager interface { SetPodAllocation(pod *v1.Pod) error // DeletePodAllocation removes any stored state for the given pod UID. - DeletePodAllocation(uid types.UID) error + DeletePodAllocation(uid types.UID) - // RemoveOrphanedPods removes the stored state for any pods not included in the list of remaining pod UIDs. - RemoveOrphanedPods(remainingPods map[types.UID]bool) + // RemoveOrphanedPods removes the stored state for any pods not included in the set of remaining pods. + RemoveOrphanedPods(remainingPods sets.Set[types.UID]) } type manager struct { @@ -151,10 +152,13 @@ func (m *manager) SetPodAllocation(pod *v1.Pod) error { return m.state.SetPodResourceAllocation(string(pod.UID), podAlloc) } -func (m *manager) DeletePodAllocation(uid types.UID) error { - return m.state.Delete(string(uid), "") +func (m *manager) DeletePodAllocation(uid types.UID) { + if err := m.state.Delete(string(uid), ""); err != nil { + // If the deletion fails, it will be retried by RemoveOrphanedPods, so we can safely ignore the error. + klog.V(3).ErrorS(err, "Failed to delete pod allocation", "podUID", uid) + } } -func (m *manager) RemoveOrphanedPods(remainingPods map[types.UID]bool) { +func (m *manager) RemoveOrphanedPods(remainingPods sets.Set[types.UID]) { m.state.RemoveOrphanedPods(remainingPods) } diff --git a/pkg/kubelet/allocation/state/state.go b/pkg/kubelet/allocation/state/state.go index f8cf22b8fec..4688b087839 100644 --- a/pkg/kubelet/allocation/state/state.go +++ b/pkg/kubelet/allocation/state/state.go @@ -19,6 +19,7 @@ package state import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/sets" ) // PodResourceAllocation type is used in tracking resources allocated to pod's containers @@ -49,8 +50,8 @@ type writer interface { SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceRequirements) error SetPodResourceAllocation(podUID string, alloc map[string]v1.ResourceRequirements) error Delete(podUID string, containerName string) error - // RemoveOrphanedPods removes the stored state for any pods not included in the list of remaining pod UIDs. - RemoveOrphanedPods(remainingPods map[types.UID]bool) + // RemoveOrphanedPods removes the stored state for any pods not included in the set of remaining pods. + RemoveOrphanedPods(remainingPods sets.Set[types.UID]) } // State interface provides methods for tracking and setting pod resource allocation diff --git a/pkg/kubelet/allocation/state/state_checkpoint.go b/pkg/kubelet/allocation/state/state_checkpoint.go index 1b1b70af178..b326f2ff084 100644 --- a/pkg/kubelet/allocation/state/state_checkpoint.go +++ b/pkg/kubelet/allocation/state/state_checkpoint.go @@ -23,6 +23,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors" @@ -140,7 +141,7 @@ func (sc *stateCheckpoint) Delete(podUID string, containerName string) error { return sc.storeState() } -func (sc *stateCheckpoint) RemoveOrphanedPods(remainingPods map[types.UID]bool) { +func (sc *stateCheckpoint) RemoveOrphanedPods(remainingPods sets.Set[types.UID]) { sc.cache.RemoveOrphanedPods(remainingPods) // Don't bother updating the stored state. If Kubelet is restarted before the cache is written, // the orphaned pods will be removed the next time this method is called. @@ -173,4 +174,4 @@ func (sc *noopStateCheckpoint) Delete(_ string, _ string) error { return nil } -func (sc *noopStateCheckpoint) RemoveOrphanedPods(_ map[types.UID]bool) {} +func (sc *noopStateCheckpoint) RemoveOrphanedPods(_ sets.Set[types.UID]) {} diff --git a/pkg/kubelet/allocation/state/state_mem.go b/pkg/kubelet/allocation/state/state_mem.go index 7b43aef7409..116b6be65dc 100644 --- a/pkg/kubelet/allocation/state/state_mem.go +++ b/pkg/kubelet/allocation/state/state_mem.go @@ -21,6 +21,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" ) @@ -98,7 +99,7 @@ func (s *stateMemory) Delete(podUID string, containerName string) error { return nil } -func (s *stateMemory) RemoveOrphanedPods(remainingPods map[types.UID]bool) { +func (s *stateMemory) RemoveOrphanedPods(remainingPods sets.Set[types.UID]) { s.Lock() defer s.Unlock() diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 479e11d3e2f..0d4abb667b9 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -77,6 +77,7 @@ import ( podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/api/v1/resource" "k8s.io/kubernetes/pkg/features" + "k8s.io/kubernetes/pkg/kubelet/allocation" kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" "k8s.io/kubernetes/pkg/kubelet/apis/podresources" @@ -662,7 +663,8 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, klet.mirrorPodClient = kubepod.NewBasicMirrorClient(klet.kubeClient, string(nodeName), nodeLister) klet.podManager = kubepod.NewBasicPodManager() - klet.statusManager = status.NewManager(klet.kubeClient, klet.podManager, klet, kubeDeps.PodStartupLatencyTracker, klet.getRootDir()) + klet.statusManager = status.NewManager(klet.kubeClient, klet.podManager, klet, kubeDeps.PodStartupLatencyTracker) + klet.allocationManager = allocation.NewManager(klet.getRootDir()) klet.resourceAnalyzer = serverstats.NewResourceAnalyzer(klet, kubeCfg.VolumeStatsAggPeriod.Duration, kubeDeps.Recorder) @@ -1147,6 +1149,9 @@ type Kubelet struct { // consult the pod worker. statusManager status.Manager + // allocationManager manages allocated resources for pods. + allocationManager allocation.Manager + // resyncInterval is the interval between periodic full reconciliations of // pods on this node. resyncInterval time.Duration @@ -2644,7 +2649,7 @@ func (kl *Kubelet) HandlePodAdditions(pods []*v1.Pod) { if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) { // To handle kubelet restarts, test pod admissibility using AllocatedResources values // (for cpu & memory) from checkpoint store. If found, that is the source of truth. - allocatedPod, _ := kl.statusManager.UpdatePodFromAllocation(pod) + allocatedPod, _ := kl.allocationManager.UpdatePodFromAllocation(pod) // Check if we can admit the pod; if not, reject it. if ok, reason, message := kl.canAdmitPod(allocatedPods, allocatedPod); !ok { @@ -2657,7 +2662,7 @@ func (kl *Kubelet) HandlePodAdditions(pods []*v1.Pod) { continue } // For new pod, checkpoint the resource values at which the Pod has been admitted - if err := kl.statusManager.SetPodAllocation(allocatedPod); err != nil { + if err := kl.allocationManager.SetPodAllocation(allocatedPod); err != nil { //TODO(vinaykul,InPlacePodVerticalScaling): Can we recover from this in some way? Investigate klog.ErrorS(err, "SetPodAllocation failed", "pod", klog.KObj(pod)) } @@ -2713,6 +2718,7 @@ func (kl *Kubelet) HandlePodRemoves(pods []*v1.Pod) { start := kl.clock.Now() for _, pod := range pods { kl.podManager.RemovePod(pod) + kl.allocationManager.DeletePodAllocation(pod.UID) pod, mirrorPod, wasMirror := kl.podManager.GetPodAndMirrorPod(pod) if wasMirror { @@ -2876,7 +2882,7 @@ func (kl *Kubelet) canResizePod(pod *v1.Pod) (bool, v1.PodResizeStatus, string) // calculations after this function is called. It also updates the cached ResizeStatus according to // the allocation decision and pod status. func (kl *Kubelet) handlePodResourcesResize(pod *v1.Pod, podStatus *kubecontainer.PodStatus) (*v1.Pod, error) { - allocatedPod, updated := kl.statusManager.UpdatePodFromAllocation(pod) + allocatedPod, updated := kl.allocationManager.UpdatePodFromAllocation(pod) if !updated { // Desired resources == allocated resources. Check whether a resize is in progress. resizeInProgress := !allocatedResourcesMatchStatus(allocatedPod, podStatus) @@ -2897,7 +2903,7 @@ func (kl *Kubelet) handlePodResourcesResize(pod *v1.Pod, podStatus *kubecontaine fit, resizeStatus, resizeMsg := kl.canResizePod(pod) if fit { // Update pod resource allocation checkpoint - if err := kl.statusManager.SetPodAllocation(pod); err != nil { + if err := kl.allocationManager.SetPodAllocation(pod); err != nil { return nil, err } for i, container := range pod.Spec.Containers { diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index ea829014121..2dd1bfa066b 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -217,7 +217,7 @@ func (kl *Kubelet) getAllocatedPods() []*v1.Pod { allocatedPods := make([]*v1.Pod, len(activePods)) for i, pod := range activePods { - allocatedPods[i], _ = kl.statusManager.UpdatePodFromAllocation(pod) + allocatedPods[i], _ = kl.allocationManager.UpdatePodFromAllocation(pod) } return allocatedPods } @@ -1169,9 +1169,9 @@ func (kl *Kubelet) HandlePodCleanups(ctx context.Context) error { // desired pods. Pods that must be restarted due to UID reuse, or leftover // pods from previous runs, are not known to the pod worker. - allPodsByUID := make(map[types.UID]*v1.Pod) + allPodsByUID := make(sets.Set[types.UID]) for _, pod := range allPods { - allPodsByUID[pod.UID] = pod + allPodsByUID.Insert(pod.UID) } // Identify the set of pods that have workers, which should be all pods @@ -1218,6 +1218,7 @@ func (kl *Kubelet) HandlePodCleanups(ctx context.Context) error { // Remove orphaned pod statuses not in the total list of known config pods klog.V(3).InfoS("Clean up orphaned pod statuses") kl.removeOrphanedPodStatuses(allPods, mirrorPods) + kl.allocationManager.RemoveOrphanedPods(allPodsByUID) // Remove orphaned pod user namespace allocations (if any). klog.V(3).InfoS("Clean up orphaned pod user namespace allocations") @@ -2147,7 +2148,7 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon // Always set the status to the latest allocated resources, even if it differs from the // allocation used by the current sync loop. - alloc, found := kl.statusManager.GetContainerResourceAllocation(string(pod.UID), cName) + alloc, found := kl.allocationManager.GetContainerResourceAllocation(string(pod.UID), cName) if !found { // This case is expected for non-resizable containers (ephemeral & non-restartable init containers). // Don't set status.Resources in this case. @@ -2367,7 +2368,7 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon status.Resources = convertContainerStatusResources(cName, status, cStatus, oldStatuses) if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScalingAllocatedStatus) { - if alloc, found := kl.statusManager.GetContainerResourceAllocation(string(pod.UID), cName); found { + if alloc, found := kl.allocationManager.GetContainerResourceAllocation(string(pod.UID), cName); found { status.AllocatedResources = alloc.Requests } } diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index 10be41a77d7..b9b767a7944 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -5087,7 +5087,8 @@ func TestConvertToAPIContainerStatusesForResources(t *testing.T) { } else { tPod.Spec.Containers[0].Resources = tc.Resources } - kubelet.statusManager.SetPodAllocation(tPod) + err := kubelet.allocationManager.SetPodAllocation(tPod) + require.NoError(t, err) resources := tc.ActualResources if resources == nil { resources = &kubecontainer.ContainerResources{ diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 8a4ff9e120a..f46defb0d03 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -62,6 +62,7 @@ import ( fakeremote "k8s.io/cri-client/pkg/fake" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/features" + "k8s.io/kubernetes/pkg/kubelet/allocation" "k8s.io/kubernetes/pkg/kubelet/allocation/state" kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" @@ -272,7 +273,8 @@ func newTestKubeletWithImageList( kubelet.mirrorPodClient = fakeMirrorClient kubelet.podManager = kubepod.NewBasicPodManager() podStartupLatencyTracker := kubeletutil.NewPodStartupLatencyTracker() - kubelet.statusManager = status.NewManager(fakeKubeClient, kubelet.podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker, kubelet.getRootDir()) + kubelet.statusManager = status.NewManager(fakeKubeClient, kubelet.podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker) + kubelet.allocationManager = allocation.NewInMemoryManager() kubelet.nodeStartupLatencyTracker = kubeletutil.NewNodeStartupLatencyTracker() kubelet.containerRuntime = fakeRuntime @@ -2566,14 +2568,14 @@ func TestPodResourceAllocationReset(t *testing.T) { t.Run(tc.name, func(t *testing.T) { if tc.existingPodAllocation != nil { // when kubelet restarts, AllocatedResources has already existed before adding pod - err := kubelet.statusManager.SetPodAllocation(tc.existingPodAllocation) + err := kubelet.allocationManager.SetPodAllocation(tc.existingPodAllocation) if err != nil { t.Fatalf("failed to set pod allocation: %v", err) } } kubelet.HandlePodAdditions([]*v1.Pod{tc.pod}) - allocatedResources, found := kubelet.statusManager.GetContainerResourceAllocation(string(tc.pod.UID), tc.pod.Spec.Containers[0].Name) + allocatedResources, found := kubelet.allocationManager.GetContainerResourceAllocation(string(tc.pod.UID), tc.pod.Spec.Containers[0].Name) if !found { t.Fatalf("resource allocation should exist: (pod: %#v, container: %s)", tc.pod, tc.pod.Spec.Containers[0].Name) } @@ -2903,9 +2905,9 @@ func TestHandlePodResourcesResize(t *testing.T) { } if !tt.newResourcesAllocated { - require.NoError(t, kubelet.statusManager.SetPodAllocation(originalPod)) + require.NoError(t, kubelet.allocationManager.SetPodAllocation(originalPod)) } else { - require.NoError(t, kubelet.statusManager.SetPodAllocation(newPod)) + require.NoError(t, kubelet.allocationManager.SetPodAllocation(newPod)) } podStatus := &kubecontainer.PodStatus{ @@ -2951,7 +2953,7 @@ func TestHandlePodResourcesResize(t *testing.T) { assert.Equal(t, tt.expectedAllocatedReqs, updatedPodCtr.Resources.Requests, "updated pod spec requests") assert.Equal(t, tt.expectedAllocatedLims, updatedPodCtr.Resources.Limits, "updated pod spec limits") - alloc, found := kubelet.statusManager.GetContainerResourceAllocation(string(newPod.UID), updatedPodCtr.Name) + alloc, found := kubelet.allocationManager.GetContainerResourceAllocation(string(newPod.UID), updatedPodCtr.Name) require.True(t, found, "container allocation") assert.Equal(t, tt.expectedAllocatedReqs, alloc.Requests, "stored container request allocation") assert.Equal(t, tt.expectedAllocatedLims, alloc.Limits, "stored container limit allocation") diff --git a/pkg/kubelet/prober/common_test.go b/pkg/kubelet/prober/common_test.go index be435cd1518..5c9f9e0112f 100644 --- a/pkg/kubelet/prober/common_test.go +++ b/pkg/kubelet/prober/common_test.go @@ -17,7 +17,6 @@ limitations under the License. package prober import ( - "os" "reflect" "sync" @@ -114,14 +113,8 @@ func newTestManager() *manager { podStartupLatencyTracker := kubeletutil.NewPodStartupLatencyTracker() // Add test pod to pod manager, so that status manager can get the pod from pod manager if needed. podManager.AddPod(getTestPod()) - testRootDir := "" - if tempDir, err := os.MkdirTemp("", "kubelet_test."); err != nil { - return nil - } else { - testRootDir = tempDir - } m := NewManager( - status.NewManager(&fake.Clientset{}, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker, testRootDir), + status.NewManager(&fake.Clientset{}, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker), results.NewManager(), results.NewManager(), results.NewManager(), diff --git a/pkg/kubelet/prober/scale_test.go b/pkg/kubelet/prober/scale_test.go index ef21df14964..35c1da6f427 100644 --- a/pkg/kubelet/prober/scale_test.go +++ b/pkg/kubelet/prober/scale_test.go @@ -21,7 +21,6 @@ import ( "fmt" "net" "net/http" - "os" "sync" "sync/atomic" "testing" @@ -81,16 +80,10 @@ func TestTCPPortExhaustion(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - testRootDir := "" - if tempDir, err := os.MkdirTemp("", "kubelet_test."); err != nil { - t.Fatalf("can't make a temp rootdir: %v", err) - } else { - testRootDir = tempDir - } podManager := kubepod.NewBasicPodManager() podStartupLatencyTracker := kubeletutil.NewPodStartupLatencyTracker() m := NewManager( - status.NewManager(&fake.Clientset{}, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker, testRootDir), + status.NewManager(&fake.Clientset{}, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker), results.NewManager(), results.NewManager(), results.NewManager(), diff --git a/pkg/kubelet/prober/worker_test.go b/pkg/kubelet/prober/worker_test.go index fa852c5be3d..3e1fa335a16 100644 --- a/pkg/kubelet/prober/worker_test.go +++ b/pkg/kubelet/prober/worker_test.go @@ -19,7 +19,6 @@ package prober import ( "context" "fmt" - "os" "testing" "time" @@ -152,14 +151,7 @@ func TestDoProbe(t *testing.T) { t.Errorf("[%s-%d] Expected result: %v but got %v", probeType, i, test.expectedResult, result) } - // Clean up. - testRootDir := "" - if tempDir, err := os.MkdirTemp("", "kubelet_test."); err != nil { - t.Fatalf("can't make a temp rootdir: %v", err) - } else { - testRootDir = tempDir - } - m.statusManager = status.NewManager(&fake.Clientset{}, kubepod.NewBasicPodManager(), &statustest.FakePodDeletionSafetyProvider{}, kubeletutil.NewPodStartupLatencyTracker(), testRootDir) + m.statusManager = status.NewManager(&fake.Clientset{}, kubepod.NewBasicPodManager(), &statustest.FakePodDeletionSafetyProvider{}, kubeletutil.NewPodStartupLatencyTracker()) resultsManager(m, probeType).Remove(testContainerID) } } diff --git a/pkg/kubelet/status/fake_status_manager.go b/pkg/kubelet/status/fake_status_manager.go index df8bb68ec97..d9c3da24402 100644 --- a/pkg/kubelet/status/fake_status_manager.go +++ b/pkg/kubelet/status/fake_status_manager.go @@ -20,13 +20,11 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/klog/v2" - "k8s.io/kubernetes/pkg/kubelet/allocation" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) type fakeManager struct { podResizeStatuses map[types.UID]v1.PodResizeStatus - allocation.Manager } func (m *fakeManager) Start() { @@ -75,7 +73,6 @@ func (m *fakeManager) SetPodResizeStatus(podUID types.UID, resizeStatus v1.PodRe // NewFakeManager creates empty/fake memory manager func NewFakeManager() Manager { return &fakeManager{ - Manager: allocation.NewInMemoryManager(), podResizeStatuses: make(map[types.UID]v1.PodResizeStatus), } } diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go index 39fb01c6d9b..323a2192ace 100644 --- a/pkg/kubelet/status/status_manager.go +++ b/pkg/kubelet/status/status_manager.go @@ -38,7 +38,6 @@ import ( "k8s.io/klog/v2" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/kubelet/allocation" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/metrics" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" @@ -79,8 +78,6 @@ type manager struct { podDeletionSafety PodDeletionSafetyProvider podStartupLatencyHelper PodStartupLatencyStateHelper - - allocation.Manager } // PodManager is the subset of methods the manager needs to observe the actual state of the kubelet. @@ -144,28 +141,12 @@ type Manager interface { // SetPodResizeStatus caches the last resizing decision for the pod. SetPodResizeStatus(podUID types.UID, resize v1.PodResizeStatus) - - allocationManager -} - -// TODO(tallclair): Refactor allocation state handling out of the status manager. -type allocationManager interface { - // GetContainerResourceAllocation returns the checkpointed AllocatedResources value for the container - GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) - - // UpdatePodFromAllocation overwrites the pod spec with the allocation. - // This function does a deep copy only if updates are needed. - // Returns the updated (or original) pod, and whether there was an allocation stored. - UpdatePodFromAllocation(pod *v1.Pod) (*v1.Pod, bool) - - // SetPodAllocation checkpoints the resources allocated to a pod's containers. - SetPodAllocation(pod *v1.Pod) error } const syncPeriod = 10 * time.Second // NewManager returns a functional Manager. -func NewManager(kubeClient clientset.Interface, podManager PodManager, podDeletionSafety PodDeletionSafetyProvider, podStartupLatencyHelper PodStartupLatencyStateHelper, stateFileDirectory string) Manager { +func NewManager(kubeClient clientset.Interface, podManager PodManager, podDeletionSafety PodDeletionSafetyProvider, podStartupLatencyHelper PodStartupLatencyStateHelper) Manager { return &manager{ kubeClient: kubeClient, podManager: podManager, @@ -175,7 +156,6 @@ func NewManager(kubeClient clientset.Interface, podManager PodManager, podDeleti apiStatusVersions: make(map[kubetypes.MirrorPodUID]uint64), podDeletionSafety: podDeletionSafety, podStartupLatencyHelper: podStartupLatencyHelper, - Manager: allocation.NewManager(stateFileDirectory), } } @@ -709,7 +689,6 @@ func (m *manager) deletePodStatus(uid types.UID) { m.podStartupLatencyHelper.DeletePodStartupState(uid) if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) { delete(m.podResizeStatuses, uid) - m.Manager.DeletePodAllocation(uid) } } @@ -726,9 +705,6 @@ func (m *manager) RemoveOrphanedStatuses(podUIDs map[types.UID]bool) { } } } - if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) { - m.Manager.RemoveOrphanedPods(podUIDs) - } } // syncBatch syncs pods statuses with the apiserver. Returns the number of syncs diff --git a/pkg/kubelet/status/status_manager_test.go b/pkg/kubelet/status/status_manager_test.go index 4e6b9d47010..dc0ed827a97 100644 --- a/pkg/kubelet/status/status_manager_test.go +++ b/pkg/kubelet/status/status_manager_test.go @@ -19,7 +19,6 @@ package status import ( "fmt" "math/rand" - "os" "reflect" "strconv" "strings" @@ -90,13 +89,7 @@ func newTestManager(kubeClient clientset.Interface) *manager { podManager := kubepod.NewBasicPodManager() podManager.(mutablePodManager).AddPod(getTestPod()) podStartupLatencyTracker := util.NewPodStartupLatencyTracker() - testRootDir := "" - if tempDir, err := os.MkdirTemp("", "kubelet_test."); err != nil { - return nil - } else { - testRootDir = tempDir - } - return NewManager(kubeClient, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker, testRootDir).(*manager) + return NewManager(kubeClient, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker).(*manager) } func generateRandomMessage() string { @@ -1086,7 +1079,7 @@ func TestTerminatePod_DefaultUnknownStatus(t *testing.T) { t.Run(tc.name, func(t *testing.T) { podManager := kubepod.NewBasicPodManager() podStartupLatencyTracker := util.NewPodStartupLatencyTracker() - syncer := NewManager(&fake.Clientset{}, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker, "").(*manager) + syncer := NewManager(&fake.Clientset{}, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker).(*manager) original := tc.pod.DeepCopy() syncer.SetPodStatus(original, original.Status) @@ -1172,7 +1165,7 @@ func TestTerminatePod_EnsurePodPhaseIsTerminal(t *testing.T) { t.Run(name, func(t *testing.T) { podManager := kubepod.NewBasicPodManager() podStartupLatencyTracker := util.NewPodStartupLatencyTracker() - syncer := NewManager(&fake.Clientset{}, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker, "").(*manager) + syncer := NewManager(&fake.Clientset{}, podManager, &statustest.FakePodDeletionSafetyProvider{}, podStartupLatencyTracker).(*manager) pod := getTestPod() pod.Status = tc.status