Revert "Gracefully delete pods from the Kubelet"

pkg/tools/etcd_helper_watch.go

@@ -39,7 +39,6 @@ const (
 	EtcdSet    = "set"
 	EtcdCAS    = "compareAndSwap"
 	EtcdDelete = "delete"
-	EtcdExpire = "expire"
 )
 
 // FilterFunc is a predicate which takes an API object and returns true
@@ -406,7 +405,7 @@ func (w *etcdWatcher) sendResult(res *etcd.Response) {
 		w.sendAdd(res)
 	case EtcdSet, EtcdCAS:
 		w.sendModify(res)
-	case EtcdDelete, EtcdExpire:
+	case EtcdDelete:
 		w.sendDelete(res)
 	default:
 		glog.Errorf("unknown action: %v", res.Action)