Skip to content

Commit 424d2e0

Browse files
Merge pull request #27 from IBM/bha-cpumemlimits
remove setting resource requests and limits for node server pods
2 parents f93458c + 0015452 commit 424d2e0

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

config/samples/csi_v1alpha1_ibmobjectcsi.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ spec:
3737
repository: icr.io/ibm/ibm-object-csi-driver
3838
tag: "v1.0.4-alpha"
3939
imagePullPolicy: Always
40-
resources:
41-
limits:
42-
cpu: "4"
43-
memory: 800Mi
44-
requests:
45-
cpu: 40m
46-
memory: 40Mi
4740
affinity:
4841
nodeAffinity:
4942
requiredDuringSchedulingIgnoredDuringExecution:

controllers/syncer/csi_node.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,19 @@ func fillSecurityContextCapabilities(sc *corev1.SecurityContext, add ...string)
353353
func getCSINodeResourceRequests(driver *crutils.IBMObjectCSI) corev1.ResourceRequirements {
354354
resources := driver.GetCSINodeResourceRequests()
355355

356-
requests := corev1.ResourceList{
357-
corev1.ResourceCPU: resource.MustParse(resources.Requests.CPU),
358-
corev1.ResourceMemory: resource.MustParse(resources.Requests.Memory),
356+
var requests, limits corev1.ResourceList
357+
358+
if resources.Requests.CPU != "" && resources.Requests.Memory != "" {
359+
requests = corev1.ResourceList{
360+
corev1.ResourceCPU: resource.MustParse(resources.Requests.CPU),
361+
corev1.ResourceMemory: resource.MustParse(resources.Requests.Memory),
362+
}
359363
}
360-
limits := corev1.ResourceList{
361-
corev1.ResourceCPU: resource.MustParse(resources.Limits.CPU),
362-
corev1.ResourceMemory: resource.MustParse(resources.Limits.Memory),
364+
if resources.Limits.CPU != "" && resources.Limits.Memory != "" {
365+
limits = corev1.ResourceList{
366+
corev1.ResourceCPU: resource.MustParse(resources.Limits.CPU),
367+
corev1.ResourceMemory: resource.MustParse(resources.Limits.Memory),
368+
}
363369
}
364370

365371
return corev1.ResourceRequirements{

0 commit comments

Comments
 (0)