Split resource definitions for:

- driver on node - driver-registrar on node - external-provisioner (controller process, but currently runs per node)
stackabletech · Jul 5, 2023 · 8fb7fce · 8fb7fce
1 parent 8613ddd
commit 8fb7fce
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 12 deletions.
diff --git a/deploy/helm/secret-operator/templates/daemonset.yaml b/deploy/helm/secret-operator/templates/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
-            {{ .Values.node.resources | toYaml | nindent 12 }}
+            {{ .Values.node.driver.resources | toYaml | nindent 12 }}
           env:
             - name: CSI_ENDPOINT
               value: /csi/csi.sock
@@ -57,7 +57,7 @@ spec:
           image: "{{ .Values.csiProvisioner.image.repository }}:{{ .Values.csiProvisioner.image.tag }}"
           imagePullPolicy: {{ .Values.csiProvisioner.image.pullPolicy }}
           resources:
-            { { .Values.node.resources | toYaml | nindent 12 } }
+            {{ .Values.controller.externalProvisioner.resources | toYaml | nindent 12 }}
           args:
             - --csi-address=/csi/csi.sock
             - --feature-gates=Topology=true
@@ -69,7 +69,7 @@ spec:
           image: "{{ .Values.csiNodeDriverRegistrar.image.repository }}:{{ .Values.csiNodeDriverRegistrar.image.tag }}"
           imagePullPolicy: {{ .Values.csiNodeDriverRegistrar.image.pullPolicy }}
           resources:
-            {{ .Values.node.resources | toYaml | nindent 12 }}
+            {{ .Values.node.driverRegistrar.resources | toYaml | nindent 12 }}
           args:
             - --csi-address=/csi/csi.sock
             - --kubelet-registration-path={{ .Values.kubeletDir }}/plugins/secrets.stackable.tech/csi.sock
@@ -88,7 +88,7 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
-            {{ .Values.node.resources | toYaml | nindent 12 }}
+            {{ .Values.node.driver.resources | toYaml | nindent 12 }}
           command:
             - /bin/bash
             - -euo

diff --git a/deploy/helm/secret-operator/values.yaml b/deploy/helm/secret-operator/values.yaml
@@ -46,15 +46,38 @@ securityContext:
   # runAsNonRoot: true
   # runAsUser: 1000
 
+controller:
+  externalProvisioner:
+    resources:
+      # Resource requests and limits for the external-provisioner container
+      # Please note: currently this is rolled out per node, but that may change
+      # in the future.
+      limits:
+        cpu: 100m
+        memory: 128Mi
+      requests:
+        cpu: 100m
+        memory: 128Mi
+
 node:
-  resources:
-    # Resource limits that are applied to the daemonset deployed by this helm chart
-    limits:
-      cpu: 100m
-      memory: 128Mi
-    requests:
-      cpu: 100m
-      memory: 128Mi
+  driver:
+    resources:
+      # Resource requests and limits for the per node driver container
+      limits:
+        cpu: 200m
+        memory: 128Mi
+      requests:
+        cpu: 100m
+        memory: 128Mi
+  driverRegistrar:
+    resources:
+      # Resource requests and limits for the container running the registrar component per node
+      limits:
+        cpu: 300m
+        memory: 128Mi
+      requests:
+        cpu: 100m
+        memory: 128Mi
 
 nodeSelector: {}