Allowlist controller: inline single-use helper functions

Remove createObject() and deleteDaemonSet() helper functions that were
each called only once. Inlining them at their call sites improves
readability by eliminating unnecessary indirection.

This also removes the unused unstructured import.

Signed-off-by: Konstantinos Karampogias <karampok@gmail.com>

Author: karampok

pkg/controller/allowlist/allowlist_controller.go

@@ -19,7 +19,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -45,7 +44,7 @@ const (
 )
 
 func Add(mgr manager.Manager, status *statusmanager.StatusManager, client cnoclient.Client, _ featuregates.FeatureGate) error {
-	r:= &ReconcileAllowlist{client: client, status: status}
+	r := &ReconcileAllowlist{client: client, status: status}
 	c, err := controller.New("allowlist-controller", mgr, controller.Options{Reconciler: r})
 	if err != nil {
 		return err
@@ -159,9 +158,8 @@ func createObjectsFrom(ctx context.Context, client cnoclient.Client, manifestPat
 		return err
 	}
 	for _, obj := range manifests {
-		err = createObject(ctx, client, obj)
-		if err != nil {
-			return err
+		if err := client.Default().CRClient().Create(ctx, obj); err != nil {
+			return errors.Wrapf(err, "error creating %s %s/%s", obj.GroupVersionKind(), obj.GetNamespace(), obj.GetName())
 		}
 	}
 	return nil
@@ -179,14 +177,6 @@ func getConfigMap(ctx context.Context, client cnoclient.Client, namespacedName t
 	return configMap, nil
 }
 
-func createObject(ctx context.Context, client cnoclient.Client, obj *unstructured.Unstructured) error {
-	err := client.Default().CRClient().Create(ctx, obj)
-	if err != nil {
-		return errors.Wrapf(err, "error creating %s %s/%s", obj.GroupVersionKind(), obj.GetNamespace(), obj.GetName())
-	}
-	return nil
-}
-
 func checkDsPodsReady(ctx context.Context, client cnoclient.Client) error {
 	return wait.PollUntilContextTimeout(ctx, time.Second, time.Minute, false, func(ctx context.Context) (done bool, err error) {
 		ds, err := getDaemonSet(ctx, client)
@@ -228,22 +218,14 @@ func cleanupDaemonSet(ctx context.Context, client cnoclient.Client) {
 		return
 	}
 	if ds != nil {
-		err = deleteDaemonSet(ctx, client)
+		err := client.Default().Kubernetes().AppsV1().DaemonSets(names.MultusNamespace).Delete(
+			ctx, dsName, metav1.DeleteOptions{})
 		if err != nil {
 			klog.Errorf("Error cleaning up allow list daemonset: %+v", err)
 		}
 	}
 }
 
-func deleteDaemonSet(ctx context.Context, client cnoclient.Client) error {
-	err := client.Default().Kubernetes().AppsV1().DaemonSets(names.MultusNamespace).Delete(
-		ctx, dsName, metav1.DeleteOptions{})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func getDaemonSet(ctx context.Context, client cnoclient.Client) (*appsv1.DaemonSet, error) {
 	ds, err := client.Default().Kubernetes().AppsV1().DaemonSets(names.MultusNamespace).Get(
 		ctx, dsName, metav1.GetOptions{})