github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass desiredPods to CleanupPods

Browse Source
This commit is contained in:
Ted Yu
2019-07-03 10:35:11 +08:00
committed by Ted Yu
parent a5e3d74691
commit 2242e396d4
8 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/pod_workers.go
View File

@@ -25,6 +25,7 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/tools/record"
"k8s.io/klog"
@@ -72,7 +73,7 @@ type UpdatePodOptions struct {
// PodWorkers is an abstract interface for testability.
type PodWorkers interface {
UpdatePod(options *UpdatePodOptions)
ForgetNonExistingPodWorkers(desiredPods map[types.UID]empty)
ForgetNonExistingPodWorkers(desiredPods map[types.UID]sets.Empty)
ForgetWorker(uid types.UID)
}
@@ -251,7 +252,7 @@ func (p *podWorkers) ForgetWorker(uid types.UID) {
p.removeWorker(uid)
}
func (p *podWorkers) ForgetNonExistingPodWorkers(desiredPods map[types.UID]empty) {
func (p *podWorkers) ForgetNonExistingPodWorkers(desiredPods map[types.UID]sets.Empty) {
p.podLock.Lock()
defer p.podLock.Unlock()
for key := range p.podUpdates {