Minor change to clusterrole (#63)

* Minor change to clusterrole * Update clusterrole.go * Update clusterrole.go * clusterole changes * Adding namespace kind * reverting back change
dell · Oct 15, 2024 · 59d9999 · 59d9999
1 parent 73f6fc0
commit 59d9999
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/controllers/csm_controller.go b/controllers/csm_controller.go
@@ -496,11 +496,11 @@ func (r *ContainerStorageModuleReconciler) SyncCSM(ctx context.Context, cr csmv1
 	}
 
 	// Create/Update ClusterRoles
-	if _, err = rbac.SyncClusterRole(ctx, &node.Rbac.ClusterRole, r.Client); err != nil {
+	if err = rbac.SyncClusterRole(ctx, &node.Rbac.ClusterRole, r.Client); err != nil {
 		return err
 	}
 
-	if _, err = rbac.SyncClusterRole(ctx, &controller.Rbac.ClusterRole, r.Client); err != nil {
+	if err = rbac.SyncClusterRole(ctx, &controller.Rbac.ClusterRole, r.Client); err != nil {
 		return err
 	}
 

diff --git a/pkg/resources/rbac/clusterrole.go b/pkg/resources/rbac/clusterrole.go
@@ -11,31 +11,31 @@ import (
 )
 
 // SyncClusterRole - Syncs a ClusterRole
-func SyncClusterRole(ctx context.Context, clusterRole *rbacv1.ClusterRole, client client.Client) (*rbacv1.ClusterRole, error) {
+func SyncClusterRole(ctx context.Context, clusterRole *rbacv1.ClusterRole, client client.Client) error {
 	log := logger.GetLogger(ctx)
 	found := &rbacv1.ClusterRole{}
 	err := client.Get(ctx, types.NamespacedName{Name: clusterRole.Name, Namespace: clusterRole.Namespace}, found)
 	if err != nil && errors.IsNotFound(err) {
 		log.Info("Creating a new ClusterRole", "Name", clusterRole.Name)
 		err = client.Create(ctx, clusterRole)
 		if err != nil {
-			return nil, err
+			return err
 		}
 		// we need to return found object
 		err := client.Get(ctx, types.NamespacedName{Name: clusterRole.Name, Namespace: clusterRole.Namespace}, found)
 		if err != nil {
-			return nil, err
+			return err
 		}
 	} else if err != nil {
 		log.Info("Unknown error.", "Error", err.Error())
-		return nil, err
+		return err
 	} else {
 		log.Info("Updating ClusterRole", "Name:", clusterRole.Name)
 		err = client.Update(ctx, clusterRole)
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 
-	return found, nil
+	return nil
 }