Skip to content

Commit 2bca311

Browse files
committed
remove tautological condition
Signed-off-by: Ashima-Ashima1 <[email protected]>
1 parent 9109a72 commit 2bca311

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

controllers/internal/crutils/ibmobjectcsi.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,12 @@ func (c *IBMObjectCSI) GetCSIControllerImage() string {
107107

108108
// GetCSIControllerResourceRequests ...
109109
func (c *IBMObjectCSI) GetCSIControllerResourceRequests() *objectdriverv1alpha1.ResourcesSpec {
110-
resources := objectdriverv1alpha1.ResourcesSpec{}
111-
112-
if &c.Spec.Controller.Resources != nil { //nolint:staticcheck
113-
resources = c.Spec.Controller.Resources
114-
}
110+
resources := c.Spec.Controller.Resources
115111
return &resources
116112
}
117113

118114
// GetCSINodeResourceRequests ...
119115
func (c *IBMObjectCSI) GetCSINodeResourceRequests() *objectdriverv1alpha1.ResourcesSpec {
120-
resources := objectdriverv1alpha1.ResourcesSpec{}
121-
122-
if &c.Spec.Node.Resources != nil { //nolint:staticcheck
123-
resources = c.Spec.Node.Resources
124-
}
116+
resources := c.Spec.Node.Resources
125117
return &resources
126118
}

controllers/syncer/csi_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ func getSidecarResourceRequests(driver *crutils.IBMObjectCSI, sidecarName string
322322

323323
sidecarResources := corev1.ResourceRequirements{}
324324

325-
if sidecar != nil && &sidecar.Resources != nil { //nolint:staticcheck
325+
if sidecar != nil {
326326
resources := sidecar.Resources
327327

328328
requests := corev1.ResourceList{

0 commit comments

Comments
 (0)