fix(test): only clean up containers created by image tests

- Restrict container cleanup to test-owned ones
  (cluster-images-populator-* and test-images-verify)
- Extract verify container name as a constant
- Export PopulatorContainerNamePrefix for reuse in tests

Author: zdyxry

internal/cluster/images.go

@@ -23,15 +23,14 @@ var (
 )
 
 const (
-	ClusterImagesVolumePrefix    = "cluster-images"
-	ClusterImagesMountPath       = "/var/lib/cluster-images"
-	populatorContainerNamePrefix = "cluster-images-populator"
-
+	ClusterImagesVolumePrefix      = "cluster-images"
+	ClusterImagesMountPath         = "/var/lib/cluster-images"
+	PopulatorContainerNamePrefix   = "cluster-images-populator"
 )
 
 // PopulatorContainerName returns the populator container name scoped to a kubeadm version.
 func PopulatorContainerName(kubeadmVersion string) string {
-	return populatorContainerNamePrefix + "-" + kubeadmVersion
+	return PopulatorContainerNamePrefix + "-" + kubeadmVersion
 }
 
 // ClusterImagesVolumeName returns the versioned volume name for a given kubeadm version.

test/integration/images_test.go

@@ -20,6 +20,8 @@ import (
 	"github.com/bootc-dev/bink/test/integration/helpers"
 )
 
+const verifyContainerName = "test-images-verify"
+
 var _ = Describe("Cluster Images Volume", Serial, func() {
 	var (
 		podmanClient *podman.Client
@@ -37,8 +39,12 @@ var _ = Describe("Cluster Images Volume", Serial, func() {
 		containers, err := podmanClient.ContainerList(ctx, "")
 		Expect(err).ToNot(HaveOccurred())
 		for _, name := range containers {
-			_ = podmanClient.ContainerStop(ctx, name)
-			_ = podmanClient.ContainerRemove(ctx, name, true)
+			// Only remove containers created by this test suite,
+			// never touch user containers.
+			if strings.HasPrefix(name, cluster.PopulatorContainerNamePrefix+"-") || name == verifyContainerName {
+				_ = podmanClient.ContainerStop(ctx, name)
+				_ = podmanClient.ContainerRemove(ctx, name, true)
+			}
 		}
 
 		kubeadmVersion, err := cluster.GetKubeadmVersionFromImage(ctx, podmanClient, config.DefaultNodeImage)
@@ -60,7 +66,7 @@ var _ = Describe("Cluster Images Volume", Serial, func() {
 	AfterEach(func() {
 		ctx := context.Background()
 
-		_ = podmanClient.ContainerRemove(ctx, "test-images-verify", true)
+		_ = podmanClient.ContainerRemove(ctx, verifyContainerName, true)
 	})
 
 	It("should populate a versioned cluster-images volume with Kubernetes and Calico images", func() {
@@ -99,9 +105,8 @@ var _ = Describe("Cluster Images Volume", Serial, func() {
 		Expect(err).ToNot(HaveOccurred(), ".completed marker should exist in the volume")
 
 		By("Verifying Calico images are stored in the volume")
-		verifyContainer := "test-images-verify"
 		_, err = podmanClient.ContainerCreate(ctx, &podman.ContainerCreateOptions{
-			Name:    verifyContainer,
+			Name:    verifyContainerName,
 			Image:   config.DefaultClusterImage,
 			Command: []string{"sleep", "infinity"},
 			Volumes: []*specgen.NamedVolume{{
@@ -111,11 +116,11 @@ var _ = Describe("Cluster Images Volume", Serial, func() {
 		})
 		Expect(err).ToNot(HaveOccurred())
 
-		err = podmanClient.ContainerExecQuiet(ctx, verifyContainer,
+		err = podmanClient.ContainerExecQuiet(ctx, verifyContainerName,
 			[]string{"podman", "image", "exists", config.CalicoImageBase + "/node:" + config.CalicoVersion})
 		Expect(err).ToNot(HaveOccurred(), "calico/node image should exist in the volume")
 
-		err = podmanClient.ContainerExecQuiet(ctx, verifyContainer,
+		err = podmanClient.ContainerExecQuiet(ctx, verifyContainerName,
 			[]string{"podman", "image", "exists", config.CalicoImageBase + "/cni:" + config.CalicoVersion})
 		Expect(err).ToNot(HaveOccurred(), "calico/cni image should exist in the volume")
 	})