move GetRelevantBuild and GetRelevantSign from Combiner to kernelMapperHelperAPI

Refactor the module.Combiner interface
by removing the GetRelevantBuild and
GetRelevantSign methods.
These methods are now part of the module.kernelMapperHelperAPI interface.
As part of the change,
renaming Combiner to BuildArgOverrider.

Author: TomerNewman

cmd/manager-hub/main.go

@@ -108,12 +108,12 @@ func main() {
 	metricsAPI.Register()
 
 	registryAPI := registry.NewRegistry()
-	buildSignCombiner := module.NewCombiner()
-	buildSignPodAPI := buildsignpod.NewBuildSignPodManager(client, buildSignCombiner, scheme)
+	buildArgOverrider := module.NewBuildArgOverrider()
+	buildSignPodAPI := buildsignpod.NewBuildSignPodManager(client, buildArgOverrider, scheme)
 
 	buildAPI := buildpod.NewBuildManager(
 		client,
-		buildpod.NewMaker(client, buildSignCombiner, buildSignPodAPI, scheme),
+		buildpod.NewMaker(client, buildArgOverrider, buildSignPodAPI, scheme),
 		buildSignPodAPI,
 		registryAPI,
 	)
@@ -125,7 +125,7 @@ func main() {
 		registryAPI,
 	)
 
-	kernelAPI := module.NewKernelMapper(buildSignCombiner)
+	kernelAPI := module.NewKernelMapper(buildArgOverrider)
 
 	ctrlLogger := setupLogger.WithValues("name", hub.ManagedClusterModuleReconcilerName)
 	ctrlLogger.Info("Adding controller")

cmd/manager/main.go

@@ -116,9 +116,9 @@ func main() {
 	metricsAPI.Register()
 
 	registryAPI := registry.NewRegistry()
-	buildSignCombinerAPI := module.NewCombiner()
+	buildArgOverriderAPI := module.NewBuildArgOverrider()
 	nodeAPI := node.NewNode(client)
-	kernelAPI := module.NewKernelMapper(buildSignCombinerAPI)
+	kernelAPI := module.NewKernelMapper(buildArgOverriderAPI)
 	micAPI := mic.New(client, scheme)
 	mbscAPI := mbsc.New(client, scheme)
 	imagePullerAPI := pod.NewImagePuller(client, scheme)
@@ -181,7 +181,7 @@ func main() {
 			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeKernelClusterClaimReconcilerName)
 		}
 	} else {
-		builSignAPI := buildsignpod.NewManager(client, buildSignCombinerAPI, scheme)
+		builSignAPI := buildsignpod.NewManager(client, buildArgOverriderAPI, scheme)
 
 		mbscr := controllers.NewMBSCReconciler(client, builSignAPI, mbscAPI)
 		if err = mbscr.SetupWithManager(mgr); err != nil {

internal/build/helper.go

@@ -10,7 +10,6 @@ import (
 
 type Helper interface {
 	ApplyBuildArgOverrides(args []kmmv1beta1.BuildArg, overrides ...kmmv1beta1.BuildArg) []kmmv1beta1.BuildArg
-	GetRelevantBuild(moduleBuild *kmmv1beta1.Build, mappingBuild *kmmv1beta1.Build) *kmmv1beta1.Build
 }
 
 type helper struct{}
@@ -43,25 +42,3 @@ func (m *helper) ApplyBuildArgOverrides(args []kmmv1beta1.BuildArg, overrides ..
 
 	return args
 }
-
-func (m *helper) GetRelevantBuild(moduleBuild *kmmv1beta1.Build, mappingBuild *kmmv1beta1.Build) *kmmv1beta1.Build {
-	if moduleBuild == nil {
-		return mappingBuild.DeepCopy()
-	}
-
-	if mappingBuild == nil {
-		return moduleBuild.DeepCopy()
-	}
-
-	buildConfig := moduleBuild.DeepCopy()
-	if mappingBuild.DockerfileConfigMap != nil {
-		buildConfig.DockerfileConfigMap = mappingBuild.DockerfileConfigMap
-	}
-
-	buildConfig.BuildArgs = m.ApplyBuildArgOverrides(buildConfig.BuildArgs, mappingBuild.BuildArgs...)
-
-	// [TODO] once MGMT-10832 is consolidated, this code must be revisited. We will decide which
-	// secret and how to use, and if we need to take care of repeated secrets names
-	buildConfig.Secrets = append(buildConfig.Secrets, mappingBuild.Secrets...)
-	return buildConfig
-}

internal/build/helper_test.go

@@ -4,54 +4,8 @@ import (
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	v1 "k8s.io/api/core/v1"
 )
 
-var _ = Describe("GetRelevantBuild", func() {
-
-	var nh Helper
-
-	BeforeEach(func() {
-		nh = NewHelper()
-	})
-
-	It("kernel mapping build present, module loader build absent", func() {
-		mappingBuild := &kmmv1beta1.Build{
-			DockerfileConfigMap: &v1.LocalObjectReference{Name: "some kernel mapping build name"},
-		}
-
-		res := nh.GetRelevantBuild(nil, mappingBuild)
-		Expect(res).To(Equal(mappingBuild))
-	})
-
-	It("kernel mapping build absent, module loader build present", func() {
-		moduleBuild := &kmmv1beta1.Build{
-			DockerfileConfigMap: &v1.LocalObjectReference{Name: "some load module build name"},
-		}
-
-		res := nh.GetRelevantBuild(moduleBuild, nil)
-
-		Expect(res).To(Equal(moduleBuild))
-	})
-
-	It("kernel mapping and module loader builds are present, overrides", func() {
-		moduleBuild := &kmmv1beta1.Build{
-			DockerfileConfigMap: &v1.LocalObjectReference{Name: "some load module build name"},
-			BaseImageRegistryTLS: kmmv1beta1.TLSOptions{
-				Insecure:              true,
-				InsecureSkipTLSVerify: true,
-			},
-		}
-		mappingBuild := &kmmv1beta1.Build{
-			DockerfileConfigMap: &v1.LocalObjectReference{Name: "some kernel mapping build name"},
-		}
-
-		res := nh.GetRelevantBuild(moduleBuild, mappingBuild)
-		Expect(res.DockerfileConfigMap).To(Equal(mappingBuild.DockerfileConfigMap))
-		Expect(res.BaseImageRegistryTLS).To(Equal(moduleBuild.BaseImageRegistryTLS))
-	})
-})
-
 var _ = Describe("ApplyBuildArgOverrides", func() {
 
 	var nh Helper

internal/build/mock_helper.go

@@ -48,16 +48,16 @@ type BuildSignPodManager interface {
 }
 
 type buildSignPodManager struct {
-	client   client.Client
-	combiner module.Combiner
-	scheme   *runtime.Scheme
+	client            client.Client
+	buildArgOverrider module.BuildArgOverrider
+	scheme            *runtime.Scheme
 }
 
-func NewBuildSignPodManager(client client.Client, combiner module.Combiner, scheme *runtime.Scheme) BuildSignPodManager {
+func NewBuildSignPodManager(client client.Client, buildArgOverrider module.BuildArgOverrider, scheme *runtime.Scheme) BuildSignPodManager {
 	return &buildSignPodManager{
-		client:   client,
-		combiner: combiner,
-		scheme:   scheme,
+		client:            client,
+		buildArgOverrider: buildArgOverrider,
+		scheme:            scheme,
 	}
 }