minor optimisations

Signed-off-by: Ashima-Ashima1 <[email protected]>

Author: ashimagarg27

controllers/ibmobjectcsi_controller.go

@@ -116,10 +116,6 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	//This ensures that the CR has all the required fields with default values before further processing or reconciliation by the operator.
 	r.Scheme.Default(instance.Unwrap())
 	changed := instance.SetDefaults()
-	if err := instance.Validate(); err != nil {
-		err = fmt.Errorf("wrong IBMObjectCSI options: %v", err)
-		return reconcile.Result{RequeueAfter: ReconcileTime}, err
-	}
 	// update CR if there was changes after defaulting
 	if changed {
 		err = r.Update(context.TODO(), instance.Unwrap())

controllers/internal/crutils/static_resource_generator.go

@@ -9,29 +9,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-const (
-	securityOpenshiftApiGroup                string = "security.openshift.io"
-	rbacAuthorizationApiGroup                string = "rbac.authorization.k8s.io"
-	storageClassesResource                   string = "storageclasses"
-	persistentVolumesResource                string = "persistentvolumes"
-	persistentVolumeClaimsResource           string = "persistentvolumeclaims"
-	persistentVolumeClaimsStatusResource     string = "persistentvolumeclaims/status"
-	persistentVolumeClaimsFinalizersResource string = "persistentvolumeclaims/finalizers"
-	podsResource                             string = "pods"
-	eventsResource                           string = "events"
-	nodesResource                            string = "nodes"
-	csiNodesResource                         string = "csinodes"
-	secretsResource                          string = "secrets"
-	securityContextConstraintsResource       string = "securitycontextconstraints"
-	verbGet                                  string = "get"
-	verbList                                 string = "list"
-	verbWatch                                string = "watch"
-	verbCreate                               string = "create"
-	verbUpdate                               string = "update"
-	verbPatch                                string = "patch"
-	verbDelete                               string = "delete"
-)
-
 func (c *IBMObjectCSI) GenerateCSIDriver() *storagev1.CSIDriver {
 	defaultFSGroupPolicy := storagev1.FileFSGroupPolicy
 	return &storagev1.CSIDriver{
@@ -75,38 +52,38 @@ func (c *IBMObjectCSI) GenerateExternalProvisionerClusterRole() *rbacv1.ClusterR
 		Rules: []rbacv1.PolicyRule{
 			{
 				APIGroups: []string{""},
-				Resources: []string{secretsResource},
-				Verbs:     []string{verbGet, verbList},
+				Resources: []string{config.SecretsResource},
+				Verbs:     []string{config.VerbGet, config.VerbList},
 			},
 			{
 				APIGroups: []string{""},
-				Resources: []string{persistentVolumesResource},
-				Verbs:     []string{verbGet, verbList, verbWatch, verbCreate, verbDelete},
+				Resources: []string{config.PersistentVolumesResource},
+				Verbs:     []string{config.VerbGet, config.VerbList, config.VerbWatch, config.VerbCreate, config.VerbDelete},
 			},
 			{
 				APIGroups: []string{""},
-				Resources: []string{persistentVolumeClaimsResource},
-				Verbs:     []string{verbGet, verbList, verbWatch, verbUpdate},
+				Resources: []string{config.PersistentVolumeClaimsResource},
+				Verbs:     []string{config.VerbGet, config.VerbList, config.VerbWatch, config.VerbUpdate},
 			},
 			{
 				APIGroups: []string{config.StorageApiGroup},
-				Resources: []string{storageClassesResource},
-				Verbs:     []string{verbGet, verbList, verbWatch},
+				Resources: []string{config.StorageClassesResource},
+				Verbs:     []string{config.VerbGet, config.VerbList, config.VerbWatch},
 			},
 			{
 				APIGroups: []string{""},
-				Resources: []string{eventsResource},
-				Verbs:     []string{verbList, verbWatch, verbCreate, verbUpdate, verbPatch},
+				Resources: []string{config.EventsResource},
+				Verbs:     []string{config.VerbList, config.VerbWatch, config.VerbCreate, config.VerbUpdate, config.VerbPatch},
 			},
 			{
 				APIGroups: []string{config.StorageApiGroup},
-				Resources: []string{csiNodesResource},
-				Verbs:     []string{verbGet, verbList, verbWatch},
+				Resources: []string{config.CsiNodesResource},
+				Verbs:     []string{config.VerbGet, config.VerbList, config.VerbWatch},
 			},
 			{
 				APIGroups: []string{""},
-				Resources: []string{nodesResource},
-				Verbs:     []string{verbGet, verbList, verbWatch},
+				Resources: []string{config.NodesResource},
+				Verbs:     []string{config.VerbGet, config.VerbList, config.VerbWatch},
 			},
 		},
 	}
@@ -127,7 +104,7 @@ func (c *IBMObjectCSI) GenerateExternalProvisionerClusterRoleBinding() *rbacv1.C
 		RoleRef: rbacv1.RoleRef{
 			Kind:     "ClusterRole",
 			Name:     config.GetNameForResource(config.ExternalProvisionerClusterRole, c.Name),
-			APIGroup: rbacAuthorizationApiGroup,
+			APIGroup: config.RbacAuthorizationApiGroup,
 		},
 	}
 }
@@ -139,8 +116,8 @@ func (c *IBMObjectCSI) GenerateSCCForControllerClusterRole() *rbacv1.ClusterRole
 		},
 		Rules: []rbacv1.PolicyRule{
 			{
-				APIGroups:     []string{securityOpenshiftApiGroup},
-				Resources:     []string{securityContextConstraintsResource},
+				APIGroups:     []string{config.SecurityOpenshiftApiGroup},
+				Resources:     []string{config.SecurityContextConstraintsResource},
 				ResourceNames: []string{"anyuid"},
 				Verbs:         []string{"use"},
 			},
@@ -163,7 +140,7 @@ func (c *IBMObjectCSI) GenerateSCCForControllerClusterRoleBinding() *rbacv1.Clus
 		RoleRef: rbacv1.RoleRef{
 			Kind:     "ClusterRole",
 			Name:     config.GetNameForResource(config.CSIControllerSCCClusterRole, c.Name),
-			APIGroup: rbacAuthorizationApiGroup,
+			APIGroup: config.RbacAuthorizationApiGroup,
 		},
 	}
 }
@@ -175,15 +152,15 @@ func (c *IBMObjectCSI) GenerateSCCForNodeClusterRole() *rbacv1.ClusterRole {
 		},
 		Rules: []rbacv1.PolicyRule{
 			{
-				APIGroups:     []string{securityOpenshiftApiGroup},
-				Resources:     []string{securityContextConstraintsResource},
+				APIGroups:     []string{config.SecurityOpenshiftApiGroup},
+				Resources:     []string{config.SecurityContextConstraintsResource},
 				ResourceNames: []string{"privileged"},
 				Verbs:         []string{"use"},
 			},
 			{
 				APIGroups: []string{""},
-				Resources: []string{nodesResource},
-				Verbs:     []string{verbGet},
+				Resources: []string{config.NodesResource},
+				Verbs:     []string{config.VerbGet},
 			},
 		},
 	}
@@ -204,7 +181,7 @@ func (c *IBMObjectCSI) GenerateSCCForNodeClusterRoleBinding() *rbacv1.ClusterRol
 		RoleRef: rbacv1.RoleRef{
 			Kind:     "ClusterRole",
 			Name:     config.GetNameForResource(config.CSINodeSCCClusterRole, c.Name),
-			APIGroup: rbacAuthorizationApiGroup,
+			APIGroup: config.RbacAuthorizationApiGroup,
 		},
 	}
 }

controllers/internal/crutils/validator.go

@@ -2,28 +2,32 @@ package config
 
 // Add a field here if it never changes, if it changes over time, put it to settings.go
 const (
-	APIGroup                  = "csi.ibm.com"
-	APIVersion                = "v1"
-	Name                      = "ibm-object-csi-operator"
-	DriverName                = "cos.s3.csi.ibm.io"
-	ProductName               = "ibm-object-csi-driver"
+	APIGroup    = "csi.ibm.com"
+	APIVersion  = "v1"
+	Name        = "ibm-object-csi-operator"
+	DriverName  = "cos.s3.csi.ibm.io"
+	ProductName = "ibm-object-csi-driver"
+
 	RbacAuthorizationApiGroup = "rbac.authorization.k8s.io"
-	CsiNodesResource          = "csinodes"
-	SecretsResource           = "secrets"
-	PodsResource              = "pods"
-	VerbGet                   = "get"
-	VerbList                  = "list"
-	VerbWatch                 = "watch"
-	VerbCreate                = "create"
-	VerbPatch                 = "patch"
+	SecurityOpenshiftApiGroup = "security.openshift.io"
 	StorageApiGroup           = "storage.k8s.io"
-	AppsApiGroup              = "apps"
-	StorageClassesResource    = "storageclasses"
-	EventsResource            = "events"
-	NodesResource             = "nodes"
-	DaemonSetResource         = "daemonsets"
 
-	ENVKubeVersion = "KUBE_VERSION"
+	CsiNodesResource                   = "csinodes"
+	SecretsResource                    = "secrets"
+	SecurityContextConstraintsResource = "securitycontextconstraints"
+	StorageClassesResource             = "storageclasses"
+	EventsResource                     = "events"
+	NodesResource                      = "nodes"
+	PersistentVolumesResource          = "persistentvolumes"
+	PersistentVolumeClaimsResource     = "persistentvolumeclaims"
+
+	VerbGet    = "get"
+	VerbList   = "list"
+	VerbWatch  = "watch"
+	VerbCreate = "create"
+	VerbUpdate = "update"
+	VerbPatch  = "patch"
+	VerbDelete = "delete"
 
 	CSINodeDriverRegistrar = "csi-node-driver-registrar"
 	CSIProvisioner         = "csi-provisioner"