add construct resource requirements

Signed-off-by: Anton Yurkov <[email protected]>
dell · Oct 29, 2021 · 4b7c5c3 · 4b7c5c3
1 parent c5391d2
commit 4b7c5c3
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 41 deletions.
diff --git a/charts/csi-baremetal-deployment/templates/_helpers.tpl b/charts/csi-baremetal-deployment/templates/_helpers.tpl
@@ -1,31 +1,27 @@
 {{- define "setResources" }}
-
 {{- if .resources }}
 {{- if or .resources.requests .resources.limits }}
 
 {{- $requestsValues := .resources.requests | values | compact }}
 {{- $limitsValues   := .resources.limits   | values | compact }}
 
-{{- if or $requestsValues $limitsValues -}}
-resources:
-  {{- if .resources.limits }}
-  limits:
-    {{- if .resources.limits.memory }}
-    memory: {{ .resources.limits.memory }}
-    {{- end }}
-    {{- if .resources.limits.cpu }}
-    cpu: {{ .resources.limits.cpu }}
-    {{- end }}
+{{- if $limitsValues }}
+limits:
+  {{- if .resources.limits.memory }}
+  memory: {{ .resources.limits.memory }}
+  {{- end }}
+  {{- if .resources.limits.cpu }}
+  cpu: {{ .resources.limits.cpu }}
   {{- end }}
+{{- end }}
 
-  {{- if .resources.requests }}
-  requests:
-    {{- if .resources.requests.memory }}
-    memory: {{ .resources.requests.memory }}
-    {{- end }}
-    {{- if .resources.requests.cpu }}
-    cpu: {{ .resources.requests.cpu }}
-    {{- end }}
+{{- if $requestsValues }}
+requests:
+  {{- if .resources.requests.memory }}
+  memory: {{ .resources.requests.memory }}
+  {{- end }}
+  {{- if .resources.requests.cpu }}
+  cpu: {{ .resources.requests.cpu }}
   {{- end }}
 {{- end }}
 

diff --git a/charts/csi-baremetal-deployment/templates/csi-baremetal_v1_deployment.yaml b/charts/csi-baremetal-deployment/templates/csi-baremetal_v1_deployment.yaml
@@ -24,7 +24,8 @@ spec:
       image:
         name: csi-baremetal-controller
         tag: {{ .Values.driver.controller.image.tag | default .Values.image.tag }}
-      {{- include "setResources" .Values.driver.controller | nindent 6 }}
+      resources:
+        {{- include "setResources" .Values.driver.controller | indent 8 }}
       log:
         format: {{ .Values.driver.log.format }}
         level: {{ .Values.driver.log.level }}
@@ -33,28 +34,33 @@ spec:
           image:
             name: livenessprobe
             tag: {{ .Values.driver.livenessProbe.image.tag }}
-          {{- include "setResources" .Values.driver.livenessProbe | nindent 10 }}
+          resources:
+            {{- include "setResources" .Values.driver.livenessProbe | indent 12 }}
         csi-provisioner:
           image:
             name: csi-provisioner
             tag: {{ .Values.driver.provisioner.image.tag }}
-          {{- include "setResources" .Values.driver.provisioner | nindent 10 }}
+          resources:
+            {{- include "setResources" .Values.driver.provisioner | indent 12 }}
         csi-resizer:
           image:
             name: csi-resizer
             tag: {{ .Values.driver.resizer.image.tag }}
-          {{- include "setResources" .Values.driver.resizer | nindent 10 }}
+          resources:
+            {{- include "setResources" .Values.driver.resizer | indent 12 }}
     node:
       driveMgr:
         image:
           name: csi-baremetal-{{ .Values.driver.drivemgr.type }}
           tag: {{ .Values.driver.drivemgr.image.tag | default .Values.image.tag }}
-        {{- include "setResources" .Values.driver.drivemgr | nindent 8 }}
+        resources:
+          {{- include "setResources" .Values.driver.drivemgr | indent 10 }}
         endpoint: {{ .Values.driver.drivemgr.grpc.server.endpoint }}
       image:
         name: csi-baremetal-node
         tag: {{ .Values.driver.node.image.tag | default .Values.image.tag }}
-      {{- include "setResources" .Values.driver.node | nindent 6 }}
+      resources:
+        {{- include "setResources" .Values.driver.node | indent 8 }}
       log:
         format: {{ .Values.driver.log.format }}
         level: {{ .Values.driver.log.level }}
@@ -63,12 +69,14 @@ spec:
           image:
             name: csi-node-driver-registrar
             tag: {{ .Values.driver.nodeDriverRegistrar.image.tag }}
-          {{- include "setResources" .Values.driver.nodeDriverRegistrar | nindent 10 }}
+          resources:
+            {{- include "setResources" .Values.driver.nodeDriverRegistrar | indent 12 }}
         livenessprobe:
           image:
             name: livenessprobe
             tag: {{ .Values.driver.livenessProbe.image.tag }}
-          {{- include "setResources" .Values.driver.livenessProbe | nindent 10 }}
+          resources:
+            {{- include "setResources" .Values.driver.livenessProbe | indent 12 }}
     metrics:
       path: {{ .Values.driver.metrics.path }}
       port: {{ .Values.driver.metrics.port }}
@@ -82,7 +90,8 @@ spec:
     image:
       name: csi-baremetal-scheduler-extender
       tag: {{ .Values.scheduler.image.tag | default .Values.image.tag }}
-    {{- include "setResources" .Values.scheduler | nindent 4 }}
+    resources:
+      {{- include "setResources" .Values.scheduler | indent 6 }}
     log:
       format: {{ .Values.scheduler.log.format }}
       level: {{ .Values.scheduler.log.level }}
@@ -95,7 +104,8 @@ spec:
       image:
         name: csi-baremetal-scheduler-patcher
         tag: {{ .Values.scheduler.patcher.image.tag | default .Values.image.tag }}
-      {{- include "setResources" .Values.scheduler.patcher | nindent 6 }}
+      resources:
+        {{- include "setResources" .Values.scheduler.patcher | indent 8 }}
       interval: {{ .Values.scheduler.patcher.interval }}
       restoreOnShutdown: {{ .Values.scheduler.patcher.restore_on_shutdown }}
       configMapName: {{ .Values.scheduler.patcher.config_map_name }}
@@ -106,7 +116,8 @@ spec:
     image:
       name: csi-baremetal-node-controller
       tag: {{ .Values.nodeController.image.tag | default .Values.image.tag }}
-    {{- include "setResources" .Values.nodeController | nindent 4 }}
+    resources:
+      {{- include "setResources" .Values.nodeController | indent 6 }}
     log:
       format: {{ .Values.nodeController.log.format }}
       level: {{ .Values.nodeController.log.level }}
diff --git a/pkg/common/common.go b/pkg/common/common.go
@@ -158,3 +158,11 @@ func ConstructSelectorMap(appName string) map[string]string {
 		constant.SelectorKey: appName,
 	}
 }
+
+// ConstructResourceRequirements creates the ResourceRequirements contains Limits and Requests lists
+func ConstructResourceRequirements(resources *components.ResourceRequirements) corev1.ResourceRequirements {
+	if resources != nil {
+		return corev1.ResourceRequirements(*resources)
+	}
+	return corev1.ResourceRequirements{}
+}
diff --git a/pkg/controller.go b/pkg/controller.go
@@ -184,7 +184,7 @@ func createControllerContainers(csi *csibaremetalv1.Deployment) []corev1.Contain
 			},
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
-			Resources:                corev1.ResourceRequirements(*c.Resources),
+			Resources:                common.ConstructResourceRequirements(c.Resources),
 		},
 		{
 			Name:            constant.ProvisionerName,
@@ -206,7 +206,7 @@ func createControllerContainers(csi *csibaremetalv1.Deployment) []corev1.Contain
 			},
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
-			Resources:                corev1.ResourceRequirements(*provisioner.Resources),
+			Resources:                common.ConstructResourceRequirements(provisioner.Resources),
 		},
 		{
 			Name:            constant.ResizerName,
@@ -227,7 +227,7 @@ func createControllerContainers(csi *csibaremetalv1.Deployment) []corev1.Contain
 			},
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
-			Resources:                corev1.ResourceRequirements(*resizer.Resources),
+			Resources:                common.ConstructResourceRequirements(resizer.Resources),
 		},
 		{
 			Name:            constant.LivenessProbeName,
@@ -243,7 +243,7 @@ func createControllerContainers(csi *csibaremetalv1.Deployment) []corev1.Contain
 			},
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
-			Resources:                corev1.ResourceRequirements(*liveness.Resources),
+			Resources:                common.ConstructResourceRequirements(liveness.Resources),
 		},
 	}
 }
diff --git a/pkg/node/node_daemonset.go b/pkg/node/node_daemonset.go
@@ -204,7 +204,7 @@ func createNodeContainers(csi *csibaremetalv1.Deployment, platform *PlatformDesc
 			},
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
-			Resources:                corev1.ResourceRequirements(*lp.Resources),
+			Resources:                common.ConstructResourceRequirements(lp.Resources),
 		},
 		{
 			Name:            constant.DriverRegistrarName,
@@ -228,7 +228,7 @@ func createNodeContainers(csi *csibaremetalv1.Deployment, platform *PlatformDesc
 			},
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
-			Resources:                corev1.ResourceRequirements(*dr.Resources),
+			Resources:                common.ConstructResourceRequirements(dr.Resources),
 		},
 		{
 			Name:            "node",
@@ -287,7 +287,7 @@ func createNodeContainers(csi *csibaremetalv1.Deployment, platform *PlatformDesc
 			VolumeMounts:             nodeMounts,
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
-			Resources:                corev1.ResourceRequirements(*node.Resources),
+			Resources:                common.ConstructResourceRequirements(node.Resources),
 		},
 		{
 			Name:            "drivemgr",
@@ -304,7 +304,7 @@ func createNodeContainers(csi *csibaremetalv1.Deployment, platform *PlatformDesc
 			VolumeMounts:             driveMgrMounts,
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
-			Resources:                corev1.ResourceRequirements(*driveMgr.Resources),
+			Resources:                common.ConstructResourceRequirements(driveMgr.Resources),
 		},
 	}
 }
diff --git a/pkg/node_controller.go b/pkg/node_controller.go
@@ -114,7 +114,7 @@ func createNodeControllerContainers(csi *csibaremetalv1.Deployment) []corev1.Con
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
 			VolumeMounts:             []corev1.VolumeMount{constant.CrashMountVolume},
-			Resources:                corev1.ResourceRequirements(*resources),
+			Resources:                common.ConstructResourceRequirements(resources),
 		},
 	}
 }
diff --git a/pkg/patcher/scheduler_patcher_vanilla.go b/pkg/patcher/scheduler_patcher_vanilla.go
@@ -243,7 +243,7 @@ func (p patcherConfiguration) createPatcherContainers() []corev1.Container {
 			},
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
-			Resources:                corev1.ResourceRequirements(*p.resources),
+			Resources:                common.ConstructResourceRequirements(p.resources),
 		},
 	}
 }

diff --git a/pkg/scheduler_extender.go b/pkg/scheduler_extender.go
@@ -176,7 +176,7 @@ func createExtenderContainers(csi *csibaremetalv1.Deployment, isPatchingEnabled
 			TerminationMessagePath:   constant.TerminationMessagePath,
 			TerminationMessagePolicy: constant.TerminationMessagePolicy,
 			VolumeMounts:             volumeMounts,
-			Resources:                corev1.ResourceRequirements(*csi.Spec.Scheduler.Resources),
+			Resources:                common.ConstructResourceRequirements(csi.Spec.Scheduler.Resources),
 		},
 	}
 }