Merge pull request #655 from hex108/evicit

k8s-ci-robot · web-flow · commit bd25e0fbb191 · 2019-03-20T19:11:35.000-07:00
Do graceful eviction using default policy
diff --git a/pkg/scheduler/cache/cache.go b/pkg/scheduler/cache/cache.go
@@ -127,14 +127,9 @@ type defaultEvictor struct {
 }
 
 func (de *defaultEvictor) Evict(p *v1.Pod) error {
-	// TODO (k82cn): makes grace period configurable.
-	threeSecs := int64(3)
-
 	glog.V(3).Infof("Evicting pod %v/%v", p.Namespace, p.Name)
 
-	if err := de.kubeclient.CoreV1().Pods(p.Namespace).Delete(p.Name, &metav1.DeleteOptions{
-		GracePeriodSeconds: &threeSecs,
-	}); err != nil {
+	if err := de.kubeclient.CoreV1().Pods(p.Namespace).Delete(p.Name, nil); err != nil {
 		glog.Errorf("Failed to evict pod <%v/%v>: %#v", p.Namespace, p.Name, err)
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -127,14 +127,9 @@ type defaultEvictor struct {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`func (de defaultEvictor) Evict(p v1.Pod) error {`
`130`		`- // TODO (k82cn): makes grace period configurable.`
`131`		`- threeSecs := int64(3)`
`132`		`-`
`133`	`130`	`glog.V(3).Infof("Evicting pod %v/%v", p.Namespace, p.Name)`
`134`	`131`
`135`		`- if err := de.kubeclient.CoreV1().Pods(p.Namespace).Delete(p.Name, &metav1.DeleteOptions{`
`136`		`- GracePeriodSeconds: &threeSecs,`
`137`		`- }); err != nil {`
	`132`	`+ if err := de.kubeclient.CoreV1().Pods(p.Namespace).Delete(p.Name, nil); err != nil {`
`138`	`133`	`glog.Errorf("Failed to evict pod <%v/%v>: %#v", p.Namespace, p.Name, err)`
`139`	`134`	`return err`
`140`	`135`	`}`