Upgrade to controller-runtime v0.15.0

Remove the logger in the filter types as those functions now get a context. Upgrade to Kubernetes v1.27.2. Bump other dependencies.
kubernetes-sigs · May 24, 2023 · 0e66ebf · 0e66ebf
1 parent df29c3d
commit 0e66ebf
Show file tree

Hide file tree

Showing 16 changed files with 183 additions and 153 deletions.
diff --git a/api-hub/v1beta1/managedclustermodule_webhook.go b/api-hub/v1beta1/managedclustermodule_webhook.go
@@ -22,6 +22,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 var modulelog = logf.Log.WithName("managed-cluster-module-resource")
@@ -39,7 +40,7 @@ func (mcm *ManagedClusterModule) SetupWebhookWithManager(mgr ctrl.Manager) error
 var _ webhook.Validator = &ManagedClusterModule{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (mcm *ManagedClusterModule) ValidateCreate() error {
+func (mcm *ManagedClusterModule) ValidateCreate() (admission.Warnings, error) {
 	modulelog.Info("Validating ManagedClusterModule creation", "name", mcm.Name, "namespace", mcm.Namespace)
 
 	module := &kmmv1beta1.Module{
@@ -49,7 +50,7 @@ func (mcm *ManagedClusterModule) ValidateCreate() error {
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (mcm *ManagedClusterModule) ValidateUpdate(obj runtime.Object) error {
+func (mcm *ManagedClusterModule) ValidateUpdate(obj runtime.Object) (admission.Warnings, error) {
 	modulelog.Info("Validating ManagedClusterModule update", "name", mcm.Name, "namespace", mcm.Namespace)
 
 	module := &kmmv1beta1.Module{
@@ -59,7 +60,7 @@ func (mcm *ManagedClusterModule) ValidateUpdate(obj runtime.Object) error {
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (mcm *ManagedClusterModule) ValidateDelete() error {
+func (mcm *ManagedClusterModule) ValidateDelete() (admission.Warnings, error) {
 	modulelog.Info("Validating ManagedClusterModule delete", "name", mcm.Name, "namespace", mcm.Namespace)
 
 	module := &kmmv1beta1.Module{

diff --git a/api/v1beta1/module_webhook.go b/api/v1beta1/module_webhook.go
@@ -26,6 +26,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -44,30 +45,30 @@ func (m *Module) SetupWebhookWithManager(mgr ctrl.Manager) error {
 var _ webhook.Validator = &Module{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (m *Module) ValidateCreate() error {
+func (m *Module) ValidateCreate() (admission.Warnings, error) {
 	modulelog.Info("Validating Module creation", "name", m.Name, "namespace", m.Namespace)
 
 	if err := m.validateKernelMapping(); err != nil {
-		return fmt.Errorf("failed to validate kernel mappings: %v", err)
+		return nil, fmt.Errorf("failed to validate kernel mappings: %v", err)
 	}
 
-	return m.validateModprobe()
+	return nil, m.validateModprobe()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (m *Module) ValidateUpdate(_ runtime.Object) error {
+func (m *Module) ValidateUpdate(_ runtime.Object) (admission.Warnings, error) {
 	modulelog.Info("Validating Module update", "name", m.Name, "namespace", m.Namespace)
 
 	if err := m.validateKernelMapping(); err != nil {
-		return fmt.Errorf("failed to validate kernel mappings: %v", err)
+		return nil, fmt.Errorf("failed to validate kernel mappings: %v", err)
 	}
 
-	return m.validateModprobe()
+	return nil, m.validateModprobe()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (m *Module) ValidateDelete() error {
-	return nil
+func (m *Module) ValidateDelete() (admission.Warnings, error) {
+	return nil, nil
 }
 
 func (m *Module) validateKernelMapping() error {

diff --git a/api/v1beta1/module_webhook_test.go b/api/v1beta1/module_webhook_test.go
@@ -373,8 +373,8 @@ var _ = Describe("ValidateCreate", func() {
 			},
 		}
 
-		e := mod.ValidateCreate()
-		Expect(e).ToNot(HaveOccurred())
+		_, err := mod.ValidateCreate()
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("should fail when validating kernel mappings regexps", func() {
@@ -390,9 +390,9 @@ var _ = Describe("ValidateCreate", func() {
 			},
 		}
 
-		e := mod.ValidateCreate()
-		Expect(e).To(HaveOccurred())
-		Expect(e.Error()).To(ContainSubstring("failed to validate kernel mappings"))
+		_, err := mod.ValidateCreate()
+		Expect(err).To(HaveOccurred())
+		Expect(err.Error()).To(ContainSubstring("failed to validate kernel mappings"))
 	})
 })
 
@@ -434,8 +434,11 @@ var _ = Describe("ValidateUpdate", func() {
 			},
 		}
 
-		Expect(mod1.ValidateUpdate(nil)).ToNot(HaveOccurred())
-		Expect(mod2.ValidateUpdate(nil)).ToNot(HaveOccurred())
+		_, err1 := mod1.ValidateUpdate(nil)
+		Expect(err1).ToNot(HaveOccurred())
+
+		_, err2 := mod2.ValidateUpdate(nil)
+		Expect(err2).ToNot(HaveOccurred())
 	})
 
 	It("should fail when validating kernel mappings regexps", func() {
@@ -451,15 +454,15 @@ var _ = Describe("ValidateUpdate", func() {
 			},
 		}
 
-		e := mod.ValidateUpdate(nil)
-		Expect(e).To(HaveOccurred())
-		Expect(e.Error()).To(ContainSubstring("failed to validate kernel mappings"))
+		_, err := mod.ValidateUpdate(nil)
+		Expect(err).To(HaveOccurred())
+		Expect(err.Error()).To(ContainSubstring("failed to validate kernel mappings"))
 	})
 })
 
 var _ = Describe("ValidateDelete", func() {
 	It("should do nothing and return always nil", func() {
 		module := &Module{}
-		Expect(module.ValidateDelete()).ToNot(HaveOccurred())
+		Expect(module.ValidateDelete()).To(BeEmpty())
 	})
 })
diff --git a/cmd/manager-hub/main.go b/cmd/manager-hub/main.go
@@ -101,7 +101,7 @@ func main() {
 
 	client := mgr.GetClient()
 
-	filterAPI := filter.New(client, mgr.GetLogger())
+	filterAPI := filter.New(client)
 
 	metricsAPI := metrics.New()
 	metricsAPI.Register()

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -107,7 +107,7 @@ func main() {
 
 	client := mgr.GetClient()
 
-	filterAPI := filter.New(client, mgr.GetLogger())
+	filterAPI := filter.New(client)
 
 	metricsAPI := metrics.New()
 	metricsAPI.Register()

diff --git a/config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml b/config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml
@@ -255,7 +255,8 @@ spec:
                                   of compute resources required. If Requests is omitted
                                   for a container, it defaults to Limits if that is
                                   explicitly specified, otherwise to an implementation-defined
-                                  value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                  value. Requests cannot exceed Limits. More info:
+                                  https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                                 type: object
                             type: object
                           volumeMounts:
@@ -728,7 +729,7 @@ spec:
                                     be the minimum value between the SizeLimit specified
                                     here and the sum of memory limits of all containers
                                     in a pod. The default is nil which means that
-                                    the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
+                                    the limit is undefined. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
                                   pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                   x-kubernetes-int-or-string: true
                               type: object
@@ -967,7 +968,8 @@ spec:
                                                 a container, it defaults to Limits
                                                 if that is explicitly specified, otherwise
                                                 to an implementation-defined value.
-                                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                Requests cannot exceed Limits. More
+                                                info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                                               type: object
                                           type: object
                                         selector:

diff --git a/config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml b/config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml
@@ -245,7 +245,7 @@ spec:
                               compute resources required. If Requests is omitted for
                               a container, it defaults to Limits if that is explicitly
                               specified, otherwise to an implementation-defined value.
-                              More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                              Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
                       volumeMounts:
@@ -698,7 +698,7 @@ spec:
                                 value between the SizeLimit specified here and the
                                 sum of memory limits of all containers in a pod. The
                                 default is nil which means that the limit is undefined.
-                                More info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
                               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                               x-kubernetes-int-or-string: true
                           type: object
@@ -925,7 +925,8 @@ spec:
                                             If Requests is omitted for a container,
                                             it defaults to Limits if that is explicitly
                                             specified, otherwise to an implementation-defined
-                                            value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                            value. Requests cannot exceed Limits.
+                                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                                           type: object
                                       type: object
                                     selector:

diff --git a/controllers/hub/managedclustermodule_reconciler.go b/controllers/hub/managedclustermodule_reconciler.go
@@ -20,6 +20,11 @@ import (
 	"context"
 	"fmt"
 
+	hubv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api-hub/v1beta1"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/cluster"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/manifestwork"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/statusupdater"
 	batchv1 "k8s.io/api/batch/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,13 +36,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/source"
-
-	hubv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api-hub/v1beta1"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/cluster"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/manifestwork"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/statusupdater"
 )
 
 const ManagedClusterModuleReconcilerName = "ManagedClusterModule"
@@ -168,7 +166,7 @@ func (r *ManagedClusterModuleReconciler) SetupWithManager(mgr ctrl.Manager) erro
 		Owns(&workv1.ManifestWork{}).
 		Owns(&batchv1.Job{}).
 		Watches(
-			&source.Kind{Type: &clusterv1.ManagedCluster{}},
+			&clusterv1.ManagedCluster{},
 			handler.EnqueueRequestsFromMapFunc(r.filter.FindManagedClusterModulesForCluster),
 			builder.WithPredicates(
 				r.filter.ManagedClusterModuleReconcilerManagedClusterPredicate(),

diff --git a/controllers/module_reconciler.go b/controllers/module_reconciler.go
@@ -45,7 +45,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
 const ModuleReconcilerName = "Module"
@@ -490,7 +489,7 @@ func (r *ModuleReconciler) SetupWithManager(mgr ctrl.Manager, kernelLabel string
 		Owns(&appsv1.DaemonSet{}).
 		Owns(&batchv1.Job{}).
 		Watches(
-			&source.Kind{Type: &v1.Node{}},
+			&v1.Node{},
 			handler.EnqueueRequestsFromMapFunc(r.filter.FindModulesForNode),
 			builder.WithPredicates(
 				r.filter.ModuleReconcilerNodePredicate(kernelLabel),

diff --git a/controllers/node_kernel_clusterclaim.go b/controllers/node_kernel_clusterclaim.go
@@ -6,6 +6,8 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"open-cluster-management.io/api/cluster/v1alpha1"
@@ -17,10 +19,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
-
-	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
 )
 
 //+kubebuilder:rbac:groups="core",resources=nodes,verbs=get;patch;list;watch
@@ -101,10 +99,8 @@ func (r *NodeKernelClusterClaimReconciler) SetupWithManager(mgr ctrl.Manager) er
 		// Each time our ClusterClaim is updated, enqueue an empty reconciliation request.
 		// We list all nodes during reconciliation, so sending an empty request is OK.
 		Watches(
-			&source.Kind{
-				Type: &v1alpha1.ClusterClaim{},
-			},
-			handler.EnqueueRequestsFromMapFunc(func(_ client.Object) []reconcile.Request {
+			&v1alpha1.ClusterClaim{},
+			handler.EnqueueRequestsFromMapFunc(func(_ context.Context, _ client.Object) []reconcile.Request {
 				return []reconcile.Request{{}}
 			}),
 			builder.WithPredicates(

diff --git a/controllers/preflightvalidation_reconciler.go b/controllers/preflightvalidation_reconciler.go
@@ -22,6 +22,11 @@ import (
 	"time"
 
 	v1beta12 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/metrics"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/preflight"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/statusupdater"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
 	batchv1 "k8s.io/api/batch/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
@@ -31,13 +36,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
-	"sigs.k8s.io/controller-runtime/pkg/source"
-
-	"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/metrics"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/preflight"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/statusupdater"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
 )
 
 const (
@@ -75,7 +73,7 @@ func (r *PreflightValidationReconciler) SetupWithManager(mgr ctrl.Manager) error
 		For(&v1beta12.PreflightValidation{}, builder.WithPredicates(filter.PreflightReconcilerUpdatePredicate())).
 		Owns(&batchv1.Job{}).
 		Watches(
-			&source.Kind{Type: &v1beta12.Module{}},
+			&v1beta12.Module{},
 			handler.EnqueueRequestsFromMapFunc(r.filter.EnqueueAllPreflightValidations),
 			builder.WithPredicates(filter.PreflightReconcilerUpdatePredicate()),
 		).