From 159c3c87de440e2ee68d94a8ec50b1fa13f7c1ac Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Tue, 7 Jul 2015 13:11:28 +0100 Subject: [PATCH] Fixes #10803: Delete Docker container volumes on GC --- pkg/kubelet/container_gc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/container_gc.go b/pkg/kubelet/container_gc.go index c5e8ffa06a7..6eecb3f6b85 100644 --- a/pkg/kubelet/container_gc.go +++ b/pkg/kubelet/container_gc.go @@ -124,7 +124,7 @@ func (cgc *realContainerGC) GarbageCollect() error { // Remove unidentified containers. for _, container := range unidentifiedContainers { glog.Infof("Removing unidentified dead container %q with ID %q", container.name, container.id) - err = cgc.dockerClient.RemoveContainer(docker.RemoveContainerOptions{ID: container.id}) + err = cgc.dockerClient.RemoveContainer(docker.RemoveContainerOptions{ID: container.id, RemoveVolumes: true}) if err != nil { glog.Warningf("Failed to remove unidentified dead container %q: %v", container.name, err) } @@ -175,7 +175,7 @@ func (cgc *realContainerGC) removeOldestN(containers []containerGCInfo, toRemove // Remove from oldest to newest (last to first). numToKeep := len(containers) - toRemove for i := numToKeep; i < len(containers); i++ { - err := cgc.dockerClient.RemoveContainer(docker.RemoveContainerOptions{ID: containers[i].id}) + err := cgc.dockerClient.RemoveContainer(docker.RemoveContainerOptions{ID: containers[i].id, RemoveVolumes: true}) if err != nil { glog.Warningf("Failed to remove dead container %q: %v", containers[i].name, err) }