Refactor Validator to remove unused client parameter and update webhook creation accordingly

Author: ryotarai

internal/hncconfig/validator.go

@@ -13,7 +13,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	api "sigs.k8s.io/hierarchical-namespaces/api/v1alpha2"
@@ -38,16 +37,14 @@ type Validator struct {
 	Log    logr.Logger
 	Forest *forest.Forest
 	mapper resourceMapper
-	client client.Client
 }
 
 type gvkSet map[schema.GroupVersionKind]api.SynchronizationMode
 
-func NewValidator(forest *forest.Forest, client client.Client) *Validator {
+func NewValidator(forest *forest.Forest) *Validator {
 	return &Validator{
 		Log:    ctrl.Log.WithName("hncconfig").WithName("validate"),
 		Forest: forest,
-		client: client,
 	}
 }
 

internal/hncconfig/validator_test.go

@@ -257,4 +257,3 @@ func (f fakeResourceMapper) NamespacedKindFor(gr schema.GroupResource) (schema.G
 	}
 	return gr2gvk[gr], nil
 }
-

internal/setup/webhooks.go

@@ -87,7 +87,7 @@ func createWebhooks(mgr ctrl.Manager, f *forest.Forest, opts Options) error {
 	}
 
 	// Create webhook for the config
-	hnconfigValidator := hncconfig.NewValidator(f, mgr.GetClient())
+	hnconfigValidator := hncconfig.NewValidator(f)
 	if err := hnconfigValidator.SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("failed to setup hncconfig validator: %w", err)
 	}