Release 2.1.1

Dockerfile.signimage

@@ -1,8 +1,8 @@
-FROM alpine:3.19 as ksource
+FROM alpine:3.20 as ksource
 
 RUN ["apk", "add", "linux-virt-dev"]
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 COPY --from=ksource /usr/src/linux-headers-*-virt/scripts/sign-file /usr/local/bin/sign-file
 

Dockerfile.worker

@@ -28,7 +28,7 @@ COPY .git .git
 # Build
 RUN ["make", "worker"]
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN ["apk", "add", "ca-certificates", "kmod"]
 

cmd/manager/main.go

@@ -22,20 +22,8 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/kubernetes-sigs/kernel-module-management/api/v1beta2"
-	"k8s.io/apimachinery/pkg/runtime"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/klog/v2/textlogger"
-	clusterv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/healthz"
-
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
-
 	"github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
+	"github.com/kubernetes-sigs/kernel-module-management/api/v1beta2"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/build"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/build/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/cmd"
@@ -51,6 +39,18 @@ import (
 	"github.com/kubernetes-sigs/kernel-module-management/internal/sign"
 	signpod "github.com/kubernetes-sigs/kernel-module-management/internal/sign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/klog/v2/textlogger"
+	clusterv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/healthz"
+
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+	// to ensure that exec-entrypoint and run can make use of them.
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -117,23 +117,8 @@ func main() {
 	metricsAPI.Register()
 
 	registryAPI := registry.NewRegistry()
-	podHelperAPI := utils.NewPodHelper(client)
 	buildHelperAPI := build.NewHelper()
 
-	buildAPI := pod.NewBuildManager(
-		client,
-		pod.NewMaker(client, buildHelperAPI, podHelperAPI, scheme),
-		podHelperAPI,
-		registryAPI,
-	)
-
-	signAPI := signpod.NewSignPodManager(
-		client,
-		signpod.NewSigner(client, scheme, podHelperAPI),
-		podHelperAPI,
-		registryAPI,
-	)
-
 	kernelAPI := module.NewKernelMapper(buildHelperAPI, sign.NewSignerHelper())
 
 	dpc := controllers.NewDevicePluginReconciler(
@@ -145,16 +130,6 @@ func main() {
 		cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.DevicePluginReconcilerName)
 	}
 
-	bsc := controllers.NewBuildSignReconciler(
-		client,
-		buildAPI,
-		signAPI,
-		kernelAPI,
-		filterAPI)
-	if err = bsc.SetupWithManager(mgr, constants.KernelLabel); err != nil {
-		cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.BuildSignReconcilerName)
-	}
-
 	mnc := controllers.NewModuleNMCReconciler(
 		client,
 		kernelAPI,
@@ -183,13 +158,6 @@ func main() {
 		cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeLabelModuleVersionReconcilerName)
 	}
 
-	preflightStatusUpdaterAPI := preflight.NewStatusUpdater(client)
-	preflightAPI := preflight.NewPreflightAPI(client, buildAPI, signAPI, registryAPI, preflightStatusUpdaterAPI, kernelAPI)
-
-	if err = controllers.NewPreflightValidationReconciler(client, filterAPI, metricsAPI, preflightStatusUpdaterAPI, preflightAPI).SetupWithManager(mgr); err != nil {
-		cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.PreflightValidationReconcilerName)
-	}
-
 	if managed {
 		setupLogger.Info("Starting as managed")
 
@@ -201,6 +169,32 @@ func main() {
 			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeKernelClusterClaimReconcilerName)
 		}
 	} else {
+		podHelperAPI := utils.NewPodHelper(client)
+
+		buildAPI := pod.NewBuildManager(
+			client,
+			pod.NewMaker(client, buildHelperAPI, podHelperAPI, scheme),
+			podHelperAPI,
+			registryAPI,
+		)
+
+		signAPI := signpod.NewSignPodManager(
+			client,
+			signpod.NewSigner(client, scheme, podHelperAPI),
+			podHelperAPI,
+			registryAPI,
+		)
+
+		bsc := controllers.NewBuildSignReconciler(
+			client,
+			buildAPI,
+			signAPI,
+			kernelAPI,
+			filterAPI)
+		if err = bsc.SetupWithManager(mgr, constants.KernelLabel); err != nil {
+			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.BuildSignReconcilerName)
+		}
+
 		helper := controllers.NewJobEventReconcilerHelper(client)
 
 		if err = controllers.NewBuildSignEventsReconciler(client, helper, eventRecorder).SetupWithManager(mgr); err != nil {
@@ -210,6 +204,13 @@ func main() {
 		if err = controllers.NewJobGCReconciler(client, cfg.Job.GCDelay).SetupWithManager(mgr); err != nil {
 			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.JobGCReconcilerName)
 		}
+
+		preflightStatusUpdaterAPI := preflight.NewStatusUpdater(client)
+		preflightAPI := preflight.NewPreflightAPI(client, buildAPI, signAPI, registryAPI, preflightStatusUpdaterAPI, kernelAPI)
+
+		if err = controllers.NewPreflightValidationReconciler(client, filterAPI, metricsAPI, preflightStatusUpdaterAPI, preflightAPI).SetupWithManager(mgr); err != nil {
+			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.PreflightValidationReconcilerName)
+		}
 	}
 
 	//+kubebuilder:scaffold:builder