From 9b9e98a22ff2259d21b230c939d4b247a3c56db4 Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Wed, 29 Apr 2015 10:41:19 +0200
Subject: [PATCH] Fixed kubelet deleting data from volumes on stop (#7317).

We must not clear the pod directory in killUnwantedPods(), volumes are still
mounted there at this time. There already is cleanupOrphanedPodDirs(),
called later in the SyncPods() sequence, which should remove these pod
directories.
---
 pkg/kubelet/kubelet.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index c5a119737c4..a3db0274354 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1466,12 +1466,6 @@ func (kl *Kubelet) killUnwantedPods(desiredPods map[types.UID]empty,
 				glog.Errorf("Failed killing the pod %q: %v", pod.Name, err)
 				return
 			}
-			// Remove the pod directory.
-			err = os.RemoveAll(kl.getPodDir(pod.ID))
-			if err != nil {
-				glog.Errorf("Failed removing pod directory for %q", pod.Name)
-				return
-			}
 		}(pod, ch)
 	}