@@ -289,15 +289,20 @@ func getSidecarByName(driver *crutils.IBMObjectCSI, name string) *objectdriverv1
289
289
func getCSIControllerResourceRequests (driver * crutils.IBMObjectCSI ) corev1.ResourceRequirements {
290
290
resources := driver .GetCSIControllerResourceRequests ()
291
291
292
- requests := corev1.ResourceList {
293
- corev1 .ResourceCPU : resource .MustParse (resources .Requests .CPU ),
294
- corev1 .ResourceMemory : resource .MustParse (resources .Requests .Memory ),
292
+ var requests , limits corev1.ResourceList
293
+
294
+ if resources .Requests .CPU != "" && resources .Requests .Memory != "" {
295
+ requests = corev1.ResourceList {
296
+ corev1 .ResourceCPU : resource .MustParse (resources .Requests .CPU ),
297
+ corev1 .ResourceMemory : resource .MustParse (resources .Requests .Memory ),
298
+ }
295
299
}
296
- limits := corev1.ResourceList {
297
- corev1 .ResourceCPU : resource .MustParse (resources .Limits .CPU ),
298
- corev1 .ResourceMemory : resource .MustParse (resources .Limits .Memory ),
300
+ if resources .Limits .CPU != "" && resources .Limits .Memory != "" {
301
+ limits = corev1.ResourceList {
302
+ corev1 .ResourceCPU : resource .MustParse (resources .Limits .CPU ),
303
+ corev1 .ResourceMemory : resource .MustParse (resources .Limits .Memory ),
304
+ }
299
305
}
300
-
301
306
return corev1.ResourceRequirements {
302
307
Limits : limits ,
303
308
Requests : requests ,
@@ -312,13 +317,19 @@ func getSidecarResourceRequests(driver *crutils.IBMObjectCSI, sidecarName string
312
317
if sidecar != nil {
313
318
resources := sidecar .Resources
314
319
315
- requests := corev1.ResourceList {
316
- corev1 .ResourceCPU : resource .MustParse (resources .Requests .CPU ),
317
- corev1 .ResourceMemory : resource .MustParse (resources .Requests .Memory ),
320
+ var requests , limits corev1.ResourceList
321
+
322
+ if resources .Requests .CPU != "" && resources .Requests .Memory != "" {
323
+ requests = corev1.ResourceList {
324
+ corev1 .ResourceCPU : resource .MustParse (resources .Requests .CPU ),
325
+ corev1 .ResourceMemory : resource .MustParse (resources .Requests .Memory ),
326
+ }
318
327
}
319
- limits := corev1.ResourceList {
320
- corev1 .ResourceCPU : resource .MustParse (resources .Limits .CPU ),
321
- corev1 .ResourceMemory : resource .MustParse (resources .Limits .Memory ),
328
+ if resources .Limits .CPU != "" && resources .Limits .Memory != "" {
329
+ limits = corev1.ResourceList {
330
+ corev1 .ResourceCPU : resource .MustParse (resources .Limits .CPU ),
331
+ corev1 .ResourceMemory : resource .MustParse (resources .Limits .Memory ),
332
+ }
322
333
}
323
334
324
335
sidecarResources .Limits = limits
0 commit comments