fix the issue of missing sandbox delete in pod remove function

Signed-off-by: fupan <[email protected]>

Author: lifupan

daemon/pod/decommission.go

@@ -49,10 +49,11 @@ func (p *XPod) ForceQuit() {
 }
 
 func (p *XPod) Remove(force bool) error {
+	var err error
 
 	if p.IsRunning() {
 		if !force {
-			err := fmt.Errorf("pod is running, cannot be removed")
+			err = fmt.Errorf("pod is running, cannot be removed")
 			p.Log(ERROR, err)
 			return err
 		}
@@ -66,6 +67,17 @@ func (p *XPod) Remove(force bool) error {
 	p.resourceLock.Lock()
 	defer p.resourceLock.Unlock()
 
+	p.Log(INFO, "removing sandbox")
+	if p.sandbox != nil {
+		err = p.sandbox.Delete()
+	}else{
+		_, err = vc.DeleteSandbox(p.globalSpec.Id)
+	}
+
+	if err != nil {
+		p.Log(ERROR, "remove sandbox failed: %v", err)
+	}
+
 	p.Log(INFO, "removing pod")
 	p.statusLock.Lock()
 	p.status = S_POD_NONE