fix review comments

Author: Bhagyashreek8

api/v1alpha1/ibmobjectcsi_types.go

@@ -36,8 +36,6 @@ type IBMObjectCSISpec struct {
 	ImagePullSecrets []string `json:"imagePullSecrets,omitempty"`
 
 	HealthPort uint16 `json:"healthPort,omitempty"`
-
-	Resources ResourcesSpec `json:"resources,omitempty"`
 }
 
 type ResourcesSpec struct {

api/v1alpha1/zz_generated.deepcopy.go

@@ -1990,32 +1990,6 @@ spec:
                 - repository
                 - tag
                 type: object
-              resources:
-                properties:
-                  limits:
-                    properties:
-                      cpu:
-                        type: string
-                      memory:
-                        type: string
-                    required:
-                    - cpu
-                    - memory
-                    type: object
-                  requests:
-                    properties:
-                      cpu:
-                        type: string
-                      memory:
-                        type: string
-                    required:
-                    - cpu
-                    - memory
-                    type: object
-                required:
-                - limits
-                - requests
-                type: object
               sidecars:
                 items:
                   properties:

config/crd/bases/objectdriver.csi.ibm.com_ibmobjectcsis.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: bhagyak1/ibm-object-csi-driver-operator
-  newTag: apr803
+  newTag: apr1801

config/manager/kustomization.yaml

@@ -115,10 +115,3 @@ func (c *IBMObjectCSI) GetCSINodeResourceRequests() *objectdriverv1alpha1.Resour
 	}
 	return &resources
 }
-
-func (c *IBMObjectCSI) GetCSIResource(image string) string {
-	if c.Spec.Controller.Tag == "" {
-		return c.Spec.Controller.Repository
-	}
-	return c.Spec.Controller.Repository + ":" + c.Spec.Controller.Tag
-}

controllers/internal/crutils/ibmobjectcsi.go

@@ -112,7 +112,6 @@ func (s *csiControllerSyncer) ensureContainersSpec() []corev1.Container {
 		},
 	)
 
-	//controllerPlugin.Resources = ensureResources("40m", "800m", "40Mi", "400Mi")
 	controllerPlugin.Resources = getCSIControllerResourceRequests(s.driver)
 
 	healthPort := s.driver.Spec.HealthPort
@@ -165,25 +164,6 @@ func (s *csiControllerSyncer) ensureContainersSpec() []corev1.Container {
 	}
 }
 
-func ensureDefaultResources() corev1.ResourceRequirements {
-	return ensureResources("20m", "200m", "20Mi", "200Mi")
-}
-
-func ensureResources(cpuRequests, cpuLimits, memoryRequests, memoryLimits string) corev1.ResourceRequirements {
-	requests := corev1.ResourceList{
-		corev1.ResourceCPU:    resource.MustParse(cpuRequests),
-		corev1.ResourceMemory: resource.MustParse(memoryRequests),
-	}
-	limits := corev1.ResourceList{
-		corev1.ResourceCPU:    resource.MustParse(cpuLimits),
-		corev1.ResourceMemory: resource.MustParse(memoryLimits),
-	}
-
-	return corev1.ResourceRequirements{
-		Limits:   limits,
-		Requests: requests,
-	}
-}
 func (s *csiControllerSyncer) ensureContainer(name, image string, args []string) corev1.Container {
 	sc := &corev1.SecurityContext{AllowPrivilegeEscalation: boolptr.False()}
 	fillSecurityContextCapabilities(sc)
@@ -195,7 +175,6 @@ func (s *csiControllerSyncer) ensureContainer(name, image string, args []string)
 		Env:             s.getEnvFor(name),
 		VolumeMounts:    s.getVolumeMountsFor(name),
 		SecurityContext: sc,
-		//Resources:       ensureDefaultResources(),
 	}
 }
 

controllers/syncer/csi_controller.go

@@ -111,7 +111,6 @@ func (s *csiNodeSyncer) ensureContainersSpec() []corev1.Container {
 		},
 	)
 
-	//nodePlugin.Resources = ensureResources("40m", "1000m", "40Mi", "400Mi")
 	nodePlugin.Resources = getCSINodeResourceRequests(s.driver)
 
 	healthPort := s.driver.Spec.HealthPort
@@ -185,7 +184,6 @@ func (s *csiNodeSyncer) ensureContainer(name, image string, args []string) corev
 		Args:         args,
 		Env:          s.getEnvFor(name),
 		VolumeMounts: s.getVolumeMountsFor(name),
-		//Resources:    ensureDefaultResources(),
 	}
 }