github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-04 07:49:35 +00:00
Code Issues Projects Releases Wiki Activity

Revert "kubelet: return mirror pod in GetActivePods()"

Browse Source 
This reverts commit c0c93f4a52.
This commit is contained in:
Wei Huang
2019-03-07 11:22:27 -08:00
parent f8024ab087
commit c5a96b63f4
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubelet/kubelet_pods.go
View File

@@ -89,19 +89,7 @@ func (kl *Kubelet) listPodsFromDisk() ([]types.UID, error) {
// GetActivePods returns non-terminal pods
func (kl *Kubelet) GetActivePods() []*v1.Pod {
allPods, mirrorPods := kl.podManager.GetPodsAndMirrorPods()
mirrorPodSet := make(map[string]*v1.Pod)
for _, p := range mirrorPods {
mirrorPodSet[kubecontainer.GetPodFullName(p)] = p
}
for i := range allPods {
podFullName := kubecontainer.GetPodFullName(allPods[i])
// replace static pod with mirror pod as some info (e.g. spec.Priority)
// is needed to make further decisions (e.g. eviction)
if mirrorPod, ok := mirrorPodSet[podFullName]; ok {
allPods[i] = mirrorPod
}
}
allPods := kl.podManager.GetPods()
activePods := kl.filterOutTerminatedPods(allPods)
return activePods
}