Changing the GarbageCollector API of the buildsign manager

Currently the GarbageCollector API receives the PodType as an input
parameter. The PodType  is defined in the pod package, which should not
be used by the callee, since it is a porting layer. This commit changes
the API to use kmmv1beta1.BuildOrSignAction, and the translation to the
PodType will be done inside the manager code

Author: yevgeny-shnaidman

internal/buildsign/manager.go

@@ -15,5 +15,5 @@ type Manager interface {
 	GetStatus(ctx context.Context, name, namespace, kernelVersion string,
 		action kmmv1beta1.BuildOrSignAction, owner metav1.Object) (kmmv1beta1.BuildOrSignStatus, error)
 	Sync(ctx context.Context, mld *api.ModuleLoaderData, pushImage bool, owner metav1.Object, action kmmv1beta1.BuildOrSignAction) error
-	GarbageCollect(ctx context.Context, name, namespace, podType string, owner metav1.Object) ([]string, error)
+	GarbageCollect(ctx context.Context, name, namespace string, action kmmv1beta1.BuildOrSignAction, owner metav1.Object) ([]string, error)
 }

internal/buildsign/mock_manager.go

@@ -120,7 +120,11 @@ func (pm *podManager) Sync(ctx context.Context, mld *api.ModuleLoaderData, pushI
 	return nil
 }
 
-func (pm *podManager) GarbageCollect(ctx context.Context, name, namespace, podType string, owner metav1.Object) ([]string, error) {
+func (pm *podManager) GarbageCollect(ctx context.Context, name, namespace string, action kmmv1beta1.BuildOrSignAction, owner metav1.Object) ([]string, error) {
+	podType := PodTypeBuild
+	if action == kmmv1beta1.SignImage {
+		podType = PodTypeSign
+	}
 	pods, err := pm.buildSignPodManager.GetModulePods(ctx, name, namespace, podType, owner)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get %s pods for mbsc %s/%s: %v", podType, namespace, name, err)

internal/buildsign/pod/manager.go

@@ -265,7 +265,7 @@ var _ = Describe("GarbageCollect", func() {
 	It("failed to get module pods", func() {
 		mockBuildSignPodManager.EXPECT().GetModulePods(ctx, mbscName, mbscNamespace, PodTypeBuild, &testMBSC).Return(nil, fmt.Errorf("some error"))
 
-		_, err := mgr.GarbageCollect(ctx, mbscName, mbscNamespace, PodTypeBuild, &testMBSC)
+		_, err := mgr.GarbageCollect(ctx, mbscName, mbscNamespace, kmmv1beta1.BuildImage, &testMBSC)
 		Expect(err).To(HaveOccurred())
 	})
 
@@ -276,12 +276,12 @@ var _ = Describe("GarbageCollect", func() {
 			},
 		}
 		gomock.InOrder(
-			mockBuildSignPodManager.EXPECT().GetModulePods(ctx, mbscName, mbscNamespace, PodTypeBuild, &testMBSC).
+			mockBuildSignPodManager.EXPECT().GetModulePods(ctx, mbscName, mbscNamespace, PodTypeSign, &testMBSC).
 				Return([]v1.Pod{testPod}, nil),
 			mockBuildSignPodManager.EXPECT().DeletePod(ctx, &testPod).Return(fmt.Errorf("some error")),
 		)
 
-		_, err := mgr.GarbageCollect(ctx, mbscName, mbscNamespace, PodTypeBuild, &testMBSC)
+		_, err := mgr.GarbageCollect(ctx, mbscName, mbscNamespace, kmmv1beta1.SignImage, &testMBSC)
 		Expect(err).To(HaveOccurred())
 	})
 
@@ -313,7 +313,7 @@ var _ = Describe("GarbageCollect", func() {
 			mockBuildSignPodManager.EXPECT().DeletePod(ctx, &testPodSuccess).Return(nil),
 		)
 
-		res, err := mgr.GarbageCollect(ctx, mbscName, mbscNamespace, PodTypeBuild, &testMBSC)
+		res, err := mgr.GarbageCollect(ctx, mbscName, mbscNamespace, kmmv1beta1.BuildImage, &testMBSC)
 		Expect(err).To(BeNil())
 		Expect(res).To(Equal([]string{"podSuccess"}))
 	})