Merge pull request #4 from ashimagarg27/cleanup

Code Cleanup

Author: ambiknai

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ashimagarg/csi
-  newTag: "39"
+  newTag: "41"

config/manager/manager.yaml

@@ -73,12 +73,6 @@ spec:
         image: controller:latest
         imagePullPolicy: Always
         name: manager
-        env:
-        - name: WATCH_NAMESPACE
-          #value: default
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

controllers/ibmobjectcsi_controller.go

@@ -56,9 +56,7 @@ var csiLog = logf.Log.WithName("ibmobjectcsi_controller")
 type IBMObjectCSIReconciler struct {
 	client.Client
 	Scheme           *runtime.Scheme
-	Namespace        string
 	Recorder         record.EventRecorder
-	ServerVersion    string
 	ControllerHelper *common.ControllerHelper
 }
 
@@ -102,7 +100,7 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	r.ControllerHelper.Log = csiLog
 
 	// Fetch the CSIDriver instance
-	instance := crutils.New(&csiv1alpha1.IBMObjectCSI{}, r.ServerVersion)
+	instance := crutils.New(&csiv1alpha1.IBMObjectCSI{})
 	err := r.Get(context.TODO(), req.NamespacedName, instance.Unwrap())
 	if err != nil {
 		if errors.IsNotFound(err) {
@@ -130,17 +128,11 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 	// If the deletion timestamp is set, perform cleanup operations and remove a finalizer before returning from the reconciliation process.
 	if !instance.GetDeletionTimestamp().IsZero() {
-		isFinalizerExists, err := r.ControllerHelper.HasFinalizer(instance)
-		if err != nil {
+		if err := r.deleteClusterRoleBindings(instance); err != nil {
 			return reconcile.Result{}, err
 		}
-		// If the finalizer doesn't exist, return early, indicating that no further action is needed.
-
-		if !isFinalizerExists {
-			return reconcile.Result{}, nil
-		}
 
-		if err := r.deleteClusterRolesAndBindings(instance); err != nil {
+		if err := r.deleteClusterRoles(instance); err != nil {
 			return reconcile.Result{}, err
 		}
 
@@ -462,17 +454,6 @@ func (r *IBMObjectCSIReconciler) deleteCSIDriver(instance *crutils.IBMObjectCSI)
 	return nil
 }
 
-func (r *IBMObjectCSIReconciler) deleteClusterRolesAndBindings(instance *crutils.IBMObjectCSI) error {
-	if err := r.deleteClusterRoleBindings(instance); err != nil {
-		return err
-	}
-
-	if err := r.deleteClusterRoles(instance); err != nil {
-		return err
-	}
-	return nil
-}
-
 func (r *IBMObjectCSIReconciler) deleteClusterRoleBindings(instance *crutils.IBMObjectCSI) error {
 	clusterRoleBindings := r.getClusterRoleBindings(instance)
 	return r.ControllerHelper.DeleteClusterRoleBindings(clusterRoleBindings)

controllers/internal/crutils/default_setter.go

@@ -9,9 +9,7 @@ import (
 // Replace it with kubernetes native default setter when it is available.
 // https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#defaulting
 func (c *IBMObjectCSI) SetDefaults() bool {
-
 	c.setDefaultForNilSliceFields()
-
 	return c.setDefaults()
 }
 
@@ -35,7 +33,6 @@ func (c *IBMObjectCSI) setDefaults() bool {
 	}
 
 	changed = c.setDefaultSidecars() || changed
-
 	return changed
 }
 
@@ -57,11 +54,8 @@ func (c *IBMObjectCSI) setDefaultSidecars() bool {
 
 	if len(defaultSidecars) == len(c.Spec.Sidecars) {
 		for _, sidecar := range c.Spec.Sidecars {
-			if defaultSidecar, found := config.DefaultSidecarsByName[sidecar.Name]; found {
-				if sidecar != defaultSidecar {
-					change = true
-				}
-			} else {
+			defaultSidecar, found := config.DefaultSidecarsByName[sidecar.Name]
+			if (found && sidecar != defaultSidecar) || !found {
 				change = true
 			}
 		}

controllers/internal/crutils/ibmobjectcsi.go

@@ -13,14 +13,12 @@ import (
 // IBMObjectCSI is the wrapper for csiv1alpha1.IBMObjectCSI type
 type IBMObjectCSI struct {
 	*csiv1alpha1.IBMObjectCSI
-	ServerVersion string
 }
 
 // New returns a wrapper for csiv1.IBMObjectCSI
-func New(c *csiv1alpha1.IBMObjectCSI, serverVersion string) *IBMObjectCSI {
+func New(c *csiv1alpha1.IBMObjectCSI) *IBMObjectCSI {
 	return &IBMObjectCSI{
-		IBMObjectCSI:  c,
-		ServerVersion: serverVersion,
+		IBMObjectCSI: c,
 	}
 }
 

controllers/util/common/common.go

@@ -178,15 +178,6 @@ func (ch *ControllerHelper) getClusterRole(cr *rbacv1.ClusterRole) (*rbacv1.Clus
 	return found, err
 }
 
-func (ch *ControllerHelper) HasFinalizer(instance crutils.Instance) (bool, error) {
-	accessor, finalizerName, err := ch.getAccessorAndFinalizerName(instance)
-	if err != nil {
-		return false, err
-	}
-
-	return util.Contains(accessor.GetFinalizers(), finalizerName), nil
-}
-
 func (ch *ControllerHelper) AddFinalizerIfNotPresent(instance crutils.Instance,
 	unwrappedInstance client.Object) error {
 	logger := ch.Log.WithName("AddFinalizerIfNotPresent")

main.go

@@ -18,7 +18,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"os"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
@@ -41,10 +40,9 @@ import (
 )
 
 var (
-	scheme               = runtime.NewScheme()
-	setupLog             = ctrl.Log.WithName("setup")
-	watchNamespaceEnvVar = "WATCH_NAMESPACE"
-	log                  = logf.Log.WithName("cmd")
+	scheme   = runtime.NewScheme()
+	setupLog = ctrl.Log.WithName("setup")
+	log      = logf.Log.WithName("cmd")
 )
 
 func init() {
@@ -78,12 +76,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	namespace, err := getWatchNamespace()
-	if err != nil {
-		log.Error(err, "Failed to get watch namespace")
-		os.Exit(1)
-	}
-
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
 		Metrics:                metricsserver.Options{BindAddress: metricsAddr},
@@ -112,7 +104,6 @@ func main() {
 	if err = (&controllers.IBMObjectCSIReconciler{
 		Client:           mgr.GetClient(),
 		Scheme:           mgr.GetScheme(),
-		Namespace:        namespace,
 		ControllerHelper: controllerHelper,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "IBMObjectCSI")
@@ -142,11 +133,3 @@ func main() {
 		os.Exit(1)
 	}
 }
-
-func getWatchNamespace() (string, error) {
-	ns, found := os.LookupEnv(watchNamespaceEnvVar)
-	if !found {
-		return "", fmt.Errorf("%s must be set", watchNamespaceEnvVar)
-	}
-	return ns, nil
-}

pkg/util/boolptr/boolptr.go

@@ -1,15 +1,5 @@
 package boolptr
 
-// IsTrue returns true if and only if the bool pointer is non-nil and set to true.
-func IsTrue(b *bool) bool {
-	return b != nil && *b
-}
-
-// IsFalse returns true if and only if the bool pointer is non-nil and set to false.
-func IsFalse(b *bool) bool {
-	return b != nil && !*b
-}
-
 // True returns a *bool whose underlying value is true.
 func True() *bool {
 	t := true
@@ -21,23 +11,3 @@ func False() *bool {
 	t := false
 	return &t
 }
-
-// Equal returns true if and only if both values are set and equal.
-func Equal(a, b *bool) bool {
-	if a == nil || b == nil {
-		return false
-	} else {
-		return *a == *b
-	}
-}
-
-// Equal returns true if both values are set and equal or both are nil.
-func NilOrEqual(a, b *bool) bool {
-	if a == nil && b == nil {
-		return true
-	} else if a == nil || b == nil {
-		return false
-	} else {
-		return *a == *b
-	}
-}