fix(host-cleanup): don't prune containers #6762

Author: nervgh

Diff for: pkg/container_backend/buildah_backend.go

@@ -1101,10 +1101,6 @@ func (backend *BuildahBackend) PostManifest(ctx context.Context, ref string, opt
 
 func (backend *BuildahBackend) ClaimTargetPlatforms(ctx context.Context, targetPlatforms []string) {}
 
-func (backend *BuildahBackend) PruneContainers(_ context.Context, _ prune.Options) (prune.Report, error) {
-	return prune.Report{}, ErrUnsupportedFeature
-}
-
 func (backend *BuildahBackend) PruneImages(ctx context.Context, options prune.Options) (prune.Report, error) {
 	report, err := backend.buildah.PruneImages(ctx, buildah.PruneImagesOptions{})
 	if err != nil {

Diff for: pkg/container_backend/docker_server_backend.go

@@ -391,14 +391,6 @@ func (backend *DockerServerBackend) PostManifest(ctx context.Context, ref string
 	return docker.CreateImage(ctx, ref, docker.CreateImageOptions{Labels: opts.Labels})
 }
 
-func (backend *DockerServerBackend) PruneContainers(ctx context.Context, options prune.Options) (prune.Report, error) {
-	report, err := docker.ContainersPrune(ctx, docker.ContainersPruneOptions(options))
-	if err != nil {
-		return prune.Report{}, fmt.Errorf("unable to prune docker containers: %w", err)
-	}
-	return prune.Report(report), nil
-}
-
 func (backend *DockerServerBackend) PruneImages(ctx context.Context, options prune.Options) (prune.Report, error) {
 	report, err := docker.ImagesPrune(ctx, docker.ImagesPruneOptions(options))
 	if err != nil {

Diff for: pkg/container_backend/interface.go

@@ -100,8 +100,6 @@ type ContainerBackend interface {
 
 	ClaimTargetPlatforms(ctx context.Context, targetPlatforms []string)
 
-	// PruneContainers removes all stopped containers
-	PruneContainers(ctx context.Context, options prune.Options) (prune.Report, error)
 	// PruneImages removes all dangling images
 	PruneImages(ctx context.Context, options prune.Options) (prune.Report, error)
 	// PruneVolumes removes all anonymous volumes not used by at least one container

Diff for: pkg/container_backend/perf_check_container_backend.go

@@ -198,14 +198,6 @@ func (runtime *PerfCheckContainerBackend) ClaimTargetPlatforms(ctx context.Conte
 		Do(func() { runtime.ContainerBackend.ClaimTargetPlatforms(ctx, targetPlatforms) })
 }
 
-func (runtime *PerfCheckContainerBackend) PruneContainers(ctx context.Context, options prune.Options) (report prune.Report, err error) {
-	logboek.Context(ctx).Default().LogProcess("ContainerBackend.PruneContainers %v", options).
-		Do(func() {
-			report, err = runtime.ContainerBackend.PruneContainers(ctx, options)
-		})
-	return
-}
-
 func (runtime *PerfCheckContainerBackend) PruneImages(ctx context.Context, options prune.Options) (report prune.Report, err error) {
 	logboek.Context(ctx).Default().LogProcess("ContainerBackend.PruneImages %v", options).
 		Do(func() {

Diff for: pkg/docker/container.go

@@ -6,11 +6,8 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/container"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/client"
 	"golang.org/x/net/context"
-
-	"github.com/werf/werf/v2/pkg/container_backend/prune"
 )
 
 func Containers(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
@@ -48,22 +45,6 @@ func ContainerRemove(ctx context.Context, ref string, options types.ContainerRem
 	return apiCli(ctx).ContainerRemove(ctx, ref, options)
 }
 
-type (
-	ContainersPruneOptions prune.Options
-	ContainersPruneReport  prune.Report
-)
-
-func ContainersPrune(ctx context.Context, _ ContainersPruneOptions) (ContainersPruneReport, error) {
-	report, err := apiCli(ctx).ContainersPrune(ctx, filters.NewArgs())
-	if err != nil {
-		return ContainersPruneReport{}, err
-	}
-	return ContainersPruneReport{
-		ItemsDeleted:   report.ContainersDeleted,
-		SpaceReclaimed: report.SpaceReclaimed,
-	}, nil
-}
-
 func doCliCreate(c command.Cli, args ...string) error {
 	return prepareCliCmd(container.NewCreateCommand(c), args...).Execute()
 }

Diff for: pkg/host_cleaning/local_backend_cleaner.go

@@ -412,7 +412,7 @@ func (cleaner *LocalBackendCleaner) RunGC(ctx context.Context, options RunGCOpti
 		return nil
 	}
 
-	// Step 4. Remove werf containers
+	// Step 3. Remove werf containers
 	err = logboek.Context(ctx).LogBlock("Cleanup werf containers").DoError(func() error {
 		reportWerfContainers, err := cleaner.safeCleanupWerfContainers(ctx, options, vu)
 		if err != nil {
@@ -430,7 +430,7 @@ func (cleaner *LocalBackendCleaner) RunGC(ctx context.Context, options RunGCOpti
 		return fmt.Errorf("unable to remove werf containers: %w", err)
 	}
 
-	// Step 5. Remove werf images
+	// Step 4. Remove werf images
 	err = logboek.Context(ctx).LogBlock("Cleanup werf images").DoError(func() error {
 		reportWerfImages, err := cleaner.safeCleanupWerfImages(ctx, options, vu, targetVolumeUsagePercentage)
 		if err != nil {

Diff for: pkg/host_cleaning/local_backend_cleaner_test.go

@@ -97,22 +97,6 @@ var _ = Describe("LocalBackendCleaner", func() {
 		})
 	})
 
-	Describe("pruneContainers", func() {
-		It("should return err if opts.DryRun=true", func() {
-			_, err := cleaner.pruneContainers(ctx, RunGCOptions{
-				DryRun: true,
-			})
-			Expect(errors.Is(err, errOptionDryRunNotSupported)).To(BeTrue())
-		})
-		It("should call backend.PruneContainers() if opts.DryRun=true", func() {
-			backend.EXPECT().PruneContainers(ctx, prune.Options{}).Return(prune.Report{}, nil)
-
-			report, err := cleaner.pruneContainers(ctx, RunGCOptions{})
-			Expect(err).To(Succeed())
-			Expect(report).To(Equal(newCleanupReport()))
-		})
-	})
-
 	Describe("pruneImages", func() {
 		var filters filter.FilterList
 		BeforeEach(func() {
@@ -380,7 +364,6 @@ var _ = Describe("LocalBackendCleaner", func() {
 			// keep orders of backend calls
 			gomock.InOrder(
 				// use backend native GC pruning
-				backend.EXPECT().PruneContainers(ctx, prune.Options{}).Return(prune.Report{}, nil),
 				backend.EXPECT().PruneVolumes(ctx, prune.Options{}).Return(prune.Report{}, nil),
 				backend.EXPECT().PruneImages(ctx, prune.Options{Filters: imagesFilters}).Return(prune.Report{}, nil),