Revert "[Kubelet] Delay deletion of pod from the API server until volumes are deleted"

This commit is contained in:
David Ashpole
2017-02-09 08:45:18 -08:00
committed by GitHub
parent 46becf2c81
commit b224f83c37
18 changed files with 29 additions and 165 deletions

View File

@@ -28,7 +28,6 @@ import (
kubepod "k8s.io/kubernetes/pkg/kubelet/pod"
"k8s.io/kubernetes/pkg/kubelet/prober/results"
"k8s.io/kubernetes/pkg/kubelet/status"
statustest "k8s.io/kubernetes/pkg/kubelet/status/testing"
"k8s.io/kubernetes/pkg/probe"
"k8s.io/kubernetes/pkg/util/exec"
)
@@ -103,7 +102,7 @@ func newTestManager() *manager {
// Add test pod to pod manager, so that status manager can get the pod from pod manager if needed.
podManager.AddPod(getTestPod())
m := NewManager(
status.NewManager(&fake.Clientset{}, podManager, &statustest.FakePodDeletionSafetyProvider{}),
status.NewManager(&fake.Clientset{}, podManager),
results.NewManager(),
nil, // runner
refManager,