Merge pull request #16 from IBM/lintfix

ambiknai · web-flow · commit 4aa7e3162f69 · 2024-04-19T16:05:59.000+05:30
Fix linter issues for ResourceLimit changes
diff --git a/api/v1alpha1/ibmobjectcsi_types.go b/api/v1alpha1/ibmobjectcsi_types.go
@@ -39,13 +39,15 @@ type IBMObjectCSISpec struct {
 	HealthPort uint16 `json:"healthPort,omitempty"`
 }
 
+// ResourcesSpec ...
 type ResourcesSpec struct {
 	Limits   ReqLimits `json:"limits"`
 	Requests ReqLimits `json:"requests"`
 }
 
+// ReqLimits ...
 type ReqLimits struct {
-	Cpu    string `json:"cpu"`
+	CPU    string `json:"cpu"`
 	Memory string `json:"memory"`
 }
 
diff --git a/controllers/ibmobjectcsi_controller_test.go b/controllers/ibmobjectcsi_controller_test.go
@@ -63,11 +63,11 @@ var (
 
 	resources = v1alpha1.ResourcesSpec{
 		Limits: v1alpha1.ReqLimits{
-			Cpu:    "40Mi",
+			CPU:    "40Mi",
 			Memory: "200Mi",
 		},
 		Requests: v1alpha1.ReqLimits{
-			Cpu:    "40m",
+			CPU:    "40m",
 			Memory: "40Mi",
 		},
 	}
diff --git a/controllers/internal/crutils/ibmobjectcsi.go b/controllers/internal/crutils/ibmobjectcsi.go
@@ -105,19 +105,21 @@ func (c *IBMObjectCSI) GetCSIControllerImage() string {
 	return c.Spec.Controller.Repository + ":" + c.Spec.Controller.Tag
 }
 
+// GetCSIControllerResourceRequests ...
 func (c *IBMObjectCSI) GetCSIControllerResourceRequests() *objectdriverv1alpha1.ResourcesSpec {
 	resources := objectdriverv1alpha1.ResourcesSpec{}
 
-	if &c.Spec.Controller.Resources != nil {
+	if &c.Spec.Controller.Resources != nil { //nolint:staticcheck
 		resources = c.Spec.Controller.Resources
 	}
 	return &resources
 }
 
+// GetCSINodeResourceRequests ...
 func (c *IBMObjectCSI) GetCSINodeResourceRequests() *objectdriverv1alpha1.ResourcesSpec {
 	resources := objectdriverv1alpha1.ResourcesSpec{}
 
-	if &c.Spec.Node.Resources != nil {
+	if &c.Spec.Node.Resources != nil { //nolint:staticcheck
 		resources = c.Spec.Node.Resources
 	}
 	return &resources
diff --git a/controllers/syncer/csi_controller.go b/controllers/syncer/csi_controller.go
@@ -300,15 +300,14 @@ func getSidecarByName(driver *crutils.IBMObjectCSI, name string) *objectdriverv1
 }
 
 func getCSIControllerResourceRequests(driver *crutils.IBMObjectCSI) corev1.ResourceRequirements {
-
 	resources := driver.GetCSIControllerResourceRequests()
 
 	requests := corev1.ResourceList{
-		corev1.ResourceCPU:    resource.MustParse(resources.Requests.Cpu),
+		corev1.ResourceCPU:    resource.MustParse(resources.Requests.CPU),
 		corev1.ResourceMemory: resource.MustParse(resources.Requests.Memory),
 	}
 	limits := corev1.ResourceList{
-		corev1.ResourceCPU:    resource.MustParse(resources.Limits.Cpu),
+		corev1.ResourceCPU:    resource.MustParse(resources.Limits.CPU),
 		corev1.ResourceMemory: resource.MustParse(resources.Limits.Memory),
 	}
 
@@ -323,15 +322,15 @@ func getSidecarResourceRequests(driver *crutils.IBMObjectCSI, sidecarName string
 
 	sidecarResources := corev1.ResourceRequirements{}
 
-	if sidecar != nil && &sidecar.Resources != nil {
+	if sidecar != nil && &sidecar.Resources != nil { //nolint:staticcheck
 		resources := sidecar.Resources
 
 		requests := corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse(resources.Requests.Cpu),
+			corev1.ResourceCPU:    resource.MustParse(resources.Requests.CPU),
 			corev1.ResourceMemory: resource.MustParse(resources.Requests.Memory),
 		}
 		limits := corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse(resources.Limits.Cpu),
+			corev1.ResourceCPU:    resource.MustParse(resources.Limits.CPU),
 			corev1.ResourceMemory: resource.MustParse(resources.Limits.Memory),
 		}
 
diff --git a/controllers/syncer/csi_node.go b/controllers/syncer/csi_node.go
@@ -351,15 +351,14 @@ func fillSecurityContextCapabilities(sc *corev1.SecurityContext, add ...string)
 }
 
 func getCSINodeResourceRequests(driver *crutils.IBMObjectCSI) corev1.ResourceRequirements {
-
 	resources := driver.GetCSINodeResourceRequests()
 
 	requests := corev1.ResourceList{
-		corev1.ResourceCPU:    resource.MustParse(resources.Requests.Cpu),
+		corev1.ResourceCPU:    resource.MustParse(resources.Requests.CPU),
 		corev1.ResourceMemory: resource.MustParse(resources.Requests.Memory),
 	}
 	limits := corev1.ResourceList{
-		corev1.ResourceCPU:    resource.MustParse(resources.Limits.Cpu),
+		corev1.ResourceCPU:    resource.MustParse(resources.Limits.CPU),
 		corev1.ResourceMemory: resource.MustParse(resources.Limits.Memory),
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,15 @@ type IBMObjectCSISpec struct {`
`39`	`39`	HealthPort uint16 `json:"healthPort,omitempty"`
`40`	`40`	`}`
`41`	`41`
	`42`	`+// ResourcesSpec ...`
`42`	`43`	`type ResourcesSpec struct {`
`43`	`44`	Limits ReqLimits `json:"limits"`
`44`	`45`	Requests ReqLimits `json:"requests"`
`45`	`46`	`}`
`46`	`47`
	`48`	`+// ReqLimits ...`
`47`	`49`	`type ReqLimits struct {`
`48`		- Cpu string `json:"cpu"`
	`50`	+ CPU string `json:"cpu"`
`49`	`51`	Memory string `json:"memory"`
`50`	`52`	`}`
`51`	`53`
Original file line number	Diff line number	Diff line change
`@@ -105,19 +105,21 @@ func (c *IBMObjectCSI) GetCSIControllerImage() string {`
`105`	`105`	`return c.Spec.Controller.Repository + ":" + c.Spec.Controller.Tag`
`106`	`106`	`}`
`107`	`107`
	`108`	`+// GetCSIControllerResourceRequests ...`
`108`	`109`	`func (c IBMObjectCSI) GetCSIControllerResourceRequests() objectdriverv1alpha1.ResourcesSpec {`
`109`	`110`	`resources := objectdriverv1alpha1.ResourcesSpec{}`
`110`	`111`
`111`		`- if &c.Spec.Controller.Resources != nil {`
	`112`	`+ if &c.Spec.Controller.Resources != nil { //nolint:staticcheck`
`112`	`113`	`resources = c.Spec.Controller.Resources`
`113`	`114`	`}`
`114`	`115`	`return &resources`
`115`	`116`	`}`
`116`	`117`
	`118`	`+// GetCSINodeResourceRequests ...`
`117`	`119`	`func (c IBMObjectCSI) GetCSINodeResourceRequests() objectdriverv1alpha1.ResourcesSpec {`
`118`	`120`	`resources := objectdriverv1alpha1.ResourcesSpec{}`
`119`	`121`
`120`		`- if &c.Spec.Node.Resources != nil {`
	`122`	`+ if &c.Spec.Node.Resources != nil { //nolint:staticcheck`
`121`	`123`	`resources = c.Spec.Node.Resources`
`122`	`124`	`}`
`123`	`125`	`return &resources`
Original file line number	Diff line number	Diff line change
`@@ -300,15 +300,14 @@ func getSidecarByName(driver crutils.IBMObjectCSI, name string) objectdriverv1`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`func getCSIControllerResourceRequests(driver *crutils.IBMObjectCSI) corev1.ResourceRequirements {`
`303`		`-`
`304`	`303`	`resources := driver.GetCSIControllerResourceRequests()`
`305`	`304`
`306`	`305`	`requests := corev1.ResourceList{`
`307`		`- corev1.ResourceCPU: resource.MustParse(resources.Requests.Cpu),`
	`306`	`+ corev1.ResourceCPU: resource.MustParse(resources.Requests.CPU),`
`308`	`307`	`corev1.ResourceMemory: resource.MustParse(resources.Requests.Memory),`
`309`	`308`	`}`
`310`	`309`	`limits := corev1.ResourceList{`
`311`		`- corev1.ResourceCPU: resource.MustParse(resources.Limits.Cpu),`
	`310`	`+ corev1.ResourceCPU: resource.MustParse(resources.Limits.CPU),`
`312`	`311`	`corev1.ResourceMemory: resource.MustParse(resources.Limits.Memory),`
`313`	`312`	`}`
`314`	`313`
`@@ -323,15 +322,15 @@ func getSidecarResourceRequests(driver *crutils.IBMObjectCSI, sidecarName string`
`323`	`322`
`324`	`323`	`sidecarResources := corev1.ResourceRequirements{}`
`325`	`324`
`326`		`- if sidecar != nil && &sidecar.Resources != nil {`
	`325`	`+ if sidecar != nil && &sidecar.Resources != nil { //nolint:staticcheck`
`327`	`326`	`resources := sidecar.Resources`
`328`	`327`
`329`	`328`	`requests := corev1.ResourceList{`
`330`		`- corev1.ResourceCPU: resource.MustParse(resources.Requests.Cpu),`
	`329`	`+ corev1.ResourceCPU: resource.MustParse(resources.Requests.CPU),`
`331`	`330`	`corev1.ResourceMemory: resource.MustParse(resources.Requests.Memory),`
`332`	`331`	`}`
`333`	`332`	`limits := corev1.ResourceList{`
`334`		`- corev1.ResourceCPU: resource.MustParse(resources.Limits.Cpu),`
	`333`	`+ corev1.ResourceCPU: resource.MustParse(resources.Limits.CPU),`
`335`	`334`	`corev1.ResourceMemory: resource.MustParse(resources.Limits.Memory),`
`336`	`335`	`}`
`337`	`336`
Original file line number	Diff line number	Diff line change
`@@ -351,15 +351,14 @@ func fillSecurityContextCapabilities(sc *corev1.SecurityContext, add ...string)`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`func getCSINodeResourceRequests(driver *crutils.IBMObjectCSI) corev1.ResourceRequirements {`
`354`		`-`
`355`	`354`	`resources := driver.GetCSINodeResourceRequests()`
`356`	`355`
`357`	`356`	`requests := corev1.ResourceList{`
`358`		`- corev1.ResourceCPU: resource.MustParse(resources.Requests.Cpu),`
	`357`	`+ corev1.ResourceCPU: resource.MustParse(resources.Requests.CPU),`
`359`	`358`	`corev1.ResourceMemory: resource.MustParse(resources.Requests.Memory),`
`360`	`359`	`}`
`361`	`360`	`limits := corev1.ResourceList{`
`362`		`- corev1.ResourceCPU: resource.MustParse(resources.Limits.Cpu),`
	`361`	`+ corev1.ResourceCPU: resource.MustParse(resources.Limits.CPU),`
`363`	`362`	`corev1.ResourceMemory: resource.MustParse(resources.Limits.Memory),`
`364`	`363`	`}`
`365`	`364`