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.

Fixed kubelet deleting data from volumes on stop (#7317).
9b9e98a2 · Jan Safranek · 180df8e4 · 9b9e98a2
Commit 9b9e98a2 authored Apr 29, 2015 by Jan Safranek
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

kubelet.go pkg/kubelet/kubelet.go +0 -6

No files found.
--- 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)
 	}