Moving BuildSignPodManager from the pod to the buildsign package.

yevgeny-shnaidman · k8s-ci-robot · commit fa3731acb51c · 2025-03-02T00:36:56.000-08:00
BuildSignPodManager interface is used only by the build and sign packages.
Since we are moving into buildsign package, it make sense to move that
interface there, especially as it is a porting layer
diff --git a/cmd/manager-hub/main.go b/cmd/manager-hub/main.go
@@ -21,7 +21,6 @@ import (
 
 	"github.com/kubernetes-sigs/kernel-module-management/internal/config"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/controllers"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -38,6 +37,7 @@ import (
 	"github.com/kubernetes-sigs/kernel-module-management/api-hub/v1beta1"
 	buildpod "github.com/kubernetes-sigs/kernel-module-management/internal/build/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign"
+	buildsignpod "github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/cluster"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/cmd"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
@@ -109,7 +109,7 @@ func main() {
 	metricsAPI.Register()
 
 	registryAPI := registry.NewRegistry()
-	buildSignPodAPI := pod.NewBuildSignPodManager(client)
+	buildSignPodAPI := buildsignpod.NewBuildSignPodManager(client)
 	buildSignHelper := buildsign.NewHelper()
 
 	buildAPI := buildpod.NewBuildManager(
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -30,6 +30,7 @@ import (
 	"github.com/kubernetes-sigs/kernel-module-management/api/v1beta2"
 	buildpod "github.com/kubernetes-sigs/kernel-module-management/internal/build/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign"
+	buildsignpod "github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/cmd"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/config"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
@@ -178,7 +179,7 @@ func main() {
 			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeKernelClusterClaimReconcilerName)
 		}
 	} else {
-		buildSignPodAPI := pod.NewBuildSignPodManager(client)
+		buildSignPodAPI := buildsignpod.NewBuildSignPodManager(client)
 
 		buildAPI := buildpod.NewBuildManager(
 			client,
diff --git a/internal/build/manager.go b/internal/build/manager.go
@@ -6,7 +6,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 )
 
 //go:generate mockgen -source=manager.go -package=build -destination=mock_manager.go
diff --git a/internal/build/mock_manager.go b/internal/build/mock_manager.go
diff --git a/internal/build/pod/maker.go b/internal/build/pod/maker.go
@@ -18,9 +18,9 @@ import (
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/build"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/module"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 )
 
 const (
diff --git a/internal/build/pod/maker_test.go b/internal/build/pod/maker_test.go
@@ -19,9 +19,9 @@ import (
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/build"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/client"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 )
 
 var _ = Describe("MakePodTemplate", func() {
diff --git a/internal/build/pod/manager.go b/internal/build/pod/manager.go
@@ -11,8 +11,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/module"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
 )
diff --git a/internal/build/pod/manager_test.go b/internal/build/pod/manager_test.go
@@ -13,9 +13,9 @@ import (
 
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/client"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
 )
 
diff --git a/internal/buildsign/pod/buildsignpodmanager.go b/internal/buildsign/pod/buildsignpodmanager.go
diff --git a/internal/buildsign/pod/buildsignpodmanager_test.go b/internal/buildsign/pod/buildsignpodmanager_test.go
diff --git a/internal/buildsign/pod/mock_buildsignpodmanager.go b/internal/buildsign/pod/mock_buildsignpodmanager.go
diff --git a/internal/buildsign/pod/suite_test.go b/internal/buildsign/pod/suite_test.go
@@ -0,0 +1,23 @@
+package pod
+
+import (
+	"testing"
+
+	"github.com/kubernetes-sigs/kernel-module-management/internal/test"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+var scheme *runtime.Scheme
+
+func TestSuite(t *testing.T) {
+	RegisterFailHandler(Fail)
+
+	var err error
+
+	scheme, err = test.TestScheme()
+	Expect(err).NotTo(HaveOccurred())
+
+	RunSpecs(t, "BuildSign Pod Suite")
+}
diff --git a/internal/cluster/cluster.go b/internal/cluster/cluster.go
@@ -18,9 +18,9 @@ import (
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/build"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/module"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/sign"
 )
 
diff --git a/internal/cluster/cluster_test.go b/internal/cluster/cluster_test.go
@@ -17,8 +17,8 @@ import (
 	hubv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api-hub/v1beta1"
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 )
 
 const (
diff --git a/internal/controllers/build_sign_events_reconciler.go b/internal/controllers/build_sign_events_reconciler.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/meta"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"golang.org/x/exp/maps"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
diff --git a/internal/controllers/build_sign_events_reconciler_test.go b/internal/controllers/build_sign_events_reconciler_test.go
@@ -6,10 +6,10 @@ import (
 	"github.com/kubernetes-sigs/kernel-module-management/api-hub/v1beta1"
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	kmmv1beta2 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta2"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	testclient "github.com/kubernetes-sigs/kernel-module-management/internal/client"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/meta"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
diff --git a/internal/controllers/build_sign_reconciler.go b/internal/controllers/build_sign_reconciler.go
@@ -24,10 +24,10 @@ import (
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/build"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/module"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/node"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/sign"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
 	v1 "k8s.io/api/core/v1"
diff --git a/internal/controllers/build_sign_reconciler_test.go b/internal/controllers/build_sign_reconciler_test.go
@@ -7,9 +7,9 @@ import (
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/build"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/module"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/node"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/sign"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/internal/controllers/job_gc_reconciler.go b/internal/controllers/job_gc_reconciler.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	ctrl "sigs.k8s.io/controller-runtime"
diff --git a/internal/preflight/preflight.go b/internal/preflight/preflight.go
@@ -10,8 +10,8 @@ import (
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/auth"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/build"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/module"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/sign"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
diff --git a/internal/preflight/preflight_test.go b/internal/preflight/preflight_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/kubernetes-sigs/kernel-module-management/api/v1beta2"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/build"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/client"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/module"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/sign"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/internal/sign/manager.go b/internal/sign/manager.go
@@ -6,7 +6,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 )
 
 //go:generate mockgen -source=manager.go -package=sign -destination=mock_manager.go
diff --git a/internal/sign/mock_manager.go b/internal/sign/mock_manager.go
diff --git a/internal/sign/pod/manager.go b/internal/sign/pod/manager.go
@@ -11,8 +11,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/module"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
 )
diff --git a/internal/sign/pod/manager_test.go b/internal/sign/pod/manager_test.go
@@ -7,9 +7,9 @@ import (
 
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/client"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/internal/sign/pod/signer.go b/internal/sign/pod/signer.go
@@ -17,8 +17,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
 )
 
diff --git a/internal/sign/pod/signer_test.go b/internal/sign/pod/signer_test.go
@@ -17,9 +17,9 @@ import (
 
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/api"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/client"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 )
 
 var _ = Describe("MakePodTemplate", func() {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`7`	`7`
`8`	`8`	`"github.com/kubernetes-sigs/kernel-module-management/internal/api"`
`9`		`- "github.com/kubernetes-sigs/kernel-module-management/internal/pod"`
	`9`	`+ "github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`//go:generate mockgen -source=manager.go -package=build -destination=mock_manager.go`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`"sigs.k8s.io/controller-runtime/pkg/log"`
`12`	`12`
`13`	`13`	`"github.com/kubernetes-sigs/kernel-module-management/internal/api"`
	`14`	`+ "github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"`
`14`	`15`	`"github.com/kubernetes-sigs/kernel-module-management/internal/module"`
`15`		`- "github.com/kubernetes-sigs/kernel-module-management/internal/pod"`
`16`	`16`	`"github.com/kubernetes-sigs/kernel-module-management/internal/registry"`
`17`	`17`	`"github.com/kubernetes-sigs/kernel-module-management/internal/utils"`
`18`	`18`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ import (`
`13`	`13`
`14`	`14`	`kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"`
`15`	`15`	`"github.com/kubernetes-sigs/kernel-module-management/internal/api"`
	`16`	`+ "github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"`
`16`	`17`	`"github.com/kubernetes-sigs/kernel-module-management/internal/client"`
`17`	`18`	`"github.com/kubernetes-sigs/kernel-module-management/internal/constants"`
`18`		`- "github.com/kubernetes-sigs/kernel-module-management/internal/pod"`
`19`	`19`	`"github.com/kubernetes-sigs/kernel-module-management/internal/registry"`
`20`	`20`	`)`
`21`	`21`