UPSTREAM: 39059: Don't evict static pods - revert
100644 100644 M	pkg/kubelet/eviction/eviction_manager.go
@@ -311,15 +311,6 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act
// we kill at most a single pod during each eviction interval
for i := range activePods {
pod := activePods[i]
- if kubepod.IsStaticPod(pod) {
- // The eviction manager doesn't evict static pods. To stop a static
- // pod, the admin needs to remove the manifest from kubelet's
- // --config directory.
- // TODO(39124): This is a short term fix, we can't assume static pods
- // are always well behaved.
- glog.Infof("eviction manager: NOT evicting static pod %v", pod.Name)
- continue
- }
status := api.PodStatus{
Phase: api.PodFailed,
Message: fmt.Sprintf(message, resourceToReclaim),
