Skip to content

Commit 2327934

Browse files
klueskanolancon
authored andcommitted
Rename GetTopologyPodAmitHandler() as
GetAllocateResourcesPodAdmitHandler(). It is named as such to reflect its new function. Also remove the Topology Manager feature gate check at higher level kubelet.go, as it is now done in GetAllocateResourcesPodAdmitHandler().
1 parent a9c6129 commit 2327934

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

pkg/kubelet/cm/container_manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ type ContainerManager interface {
110110
// due to node recreation.
111111
ShouldResetExtendedResourceCapacity() bool
112112

113-
// GetTopologyPodAdmitHandler returns an instance of a PodAdmitHandler responsible for allocating pod resources.
114-
GetTopologyPodAdmitHandler() lifecycle.PodAdmitHandler
113+
// GetAllocateResourcesPodAdmitHandler returns an instance of a PodAdmitHandler responsible for allocating pod resources.
114+
GetAllocateResourcesPodAdmitHandler() lifecycle.PodAdmitHandler
115115

116116
// UpdateAllocatedDevices frees any Devices that are bound to terminated pods.
117117
UpdateAllocatedDevices()

pkg/kubelet/cm/container_manager_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ func (cm *containerManagerImpl) UpdatePluginResources(node *schedulernodeinfo.No
675675
return cm.deviceManager.UpdatePluginResources(node, attrs)
676676
}
677677

678-
func (cm *containerManagerImpl) GetTopologyPodAdmitHandler() lifecycle.PodAdmitHandler {
678+
func (cm *containerManagerImpl) GetAllocateResourcesPodAdmitHandler() lifecycle.PodAdmitHandler {
679679
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.TopologyManager) {
680680
return cm.topologyManager
681681
}

pkg/kubelet/cm/container_manager_stub.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (cm *containerManagerStub) ShouldResetExtendedResourceCapacity() bool {
117117
return cm.shouldResetExtendedResourceCapacity
118118
}
119119

120-
func (cm *containerManagerStub) GetTopologyPodAdmitHandler() lifecycle.PodAdmitHandler {
120+
func (cm *containerManagerStub) GetAllocateResourcesPodAdmitHandler() lifecycle.PodAdmitHandler {
121121
return topologymanager.NewFakeManager()
122122
}
123123

pkg/kubelet/cm/container_manager_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func (cm *containerManagerImpl) ShouldResetExtendedResourceCapacity() bool {
178178
return false
179179
}
180180

181-
func (cm *containerManagerImpl) GetTopologyPodAdmitHandler() lifecycle.PodAdmitHandler {
181+
func (cm *containerManagerImpl) GetAllocateResourcesPodAdmitHandler() lifecycle.PodAdmitHandler {
182182
return nil
183183
}
184184

pkg/kubelet/kubelet.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -867,9 +867,9 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
867867
}
868868
klet.AddPodSyncLoopHandler(activeDeadlineHandler)
869869
klet.AddPodSyncHandler(activeDeadlineHandler)
870-
if utilfeature.DefaultFeatureGate.Enabled(features.TopologyManager) {
871-
klet.admitHandlers.AddPodAdmitHandler(klet.containerManager.GetTopologyPodAdmitHandler())
872-
}
870+
871+
klet.admitHandlers.AddPodAdmitHandler(klet.containerManager.GetAllocateResourcesPodAdmitHandler())
872+
873873
criticalPodAdmissionHandler := preemption.NewCriticalPodAdmissionHandler(klet.GetActivePods, killPodNow(klet.podWorkers, kubeDeps.Recorder), kubeDeps.Recorder)
874874
klet.admitHandlers.AddPodAdmitHandler(lifecycle.NewPredicateAdmitHandler(klet.getNodeAnyWay, criticalPodAdmissionHandler, klet.containerManager.UpdatePluginResources))
875875
// apply functional Option's

0 commit comments

Comments
 (0)