feat: increase cpu limits

kubernetes-csi · Nov 23, 2021 · dd7305e · dd7305e
1 parent e3a4a99
commit dd7305e
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 48 deletions.
diff --git a/charts/latest/csi-driver-smb-v1.4.0.tgz b/charts/latest/csi-driver-smb-v1.4.0.tgz
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml
@@ -45,13 +45,7 @@ spec:
             - name: CSI_ENDPOINT
               value: unix://C:\\csi\\csi.sock
           imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
-          resources:
-            limits:
-              cpu: 200m
-              memory: 200Mi
-            requests:
-              cpu: 10m
-              memory: 20Mi
+          resources: {{- toYaml .Values.windows.resources.livenessProbe | nindent 12 }}
         - name: node-driver-registrar
 {{- if hasPrefix "/" .Values.image.nodeDriverRegistrar.repository }}
           image: "{{ .Values.image.baseRepo }}{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
@@ -85,13 +79,7 @@ spec:
               mountPath: C:\csi
             - name: registration-dir
               mountPath: C:\registration
-          resources:
-            limits:
-              cpu: 200m
-              memory: 200Mi
-            requests:
-              cpu: 10m
-              memory: 20Mi
+          resources: {{- toYaml .Values.windows.resources.nodeDriverRegistrar | nindent 12 }}
         - name: smb
 {{- if hasPrefix "/" .Values.image.smb.repository }}
           image: "{{ .Values.image.baseRepo }}{{ .Values.image.smb.repository }}:{{ .Values.image.smb.tag }}"
@@ -140,13 +128,7 @@ spec:
               mountPath: \\.\pipe\csi-proxy-filesystem-v1beta1
             - name: csi-proxy-smb-pipe-v1beta1
               mountPath: \\.\pipe\csi-proxy-smb-v1beta1
-          resources:
-            limits:
-              cpu: 400m
-              memory: 400Mi
-            requests:
-              cpu: 10m
-              memory: 20Mi
+          resources: {{- toYaml .Values.windows.resources.smb | nindent 12 }}
       volumes:
         - name: csi-proxy-fs-pipe-v1
           hostPath:

diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml
@@ -57,7 +57,7 @@ spec:
             - --health-port={{ .Values.node.livenessProbe.healthPort }}
             - --v=2
           imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
-          resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }}
+          resources: {{- toYaml .Values.linux.resources.livenessProbe | nindent 12 }}
         - name: node-driver-registrar
 {{- if hasPrefix "/" .Values.image.nodeDriverRegistrar.repository }}
           image: "{{ .Values.image.baseRepo }}{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
@@ -87,7 +87,7 @@ spec:
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
-          resources: {{- toYaml .Values.node.resources.nodeDriverRegistrar | nindent 12 }}
+          resources: {{- toYaml .Values.linux.resources.nodeDriverRegistrar | nindent 12 }}
         - name: smb
 {{- if hasPrefix "/" .Values.image.smb.repository }}
           image: "{{ .Values.image.baseRepo }}{{ .Values.image.smb.repository }}:{{ .Values.image.smb.tag }}"
@@ -129,7 +129,7 @@ spec:
             - mountPath: {{ .Values.linux.kubelet }}/
               mountPropagation: Bidirectional
               name: mountpoint-dir
-          resources: {{- toYaml .Values.node.resources.smb | nindent 12 }}
+          resources: {{- toYaml .Values.linux.resources.smb | nindent 12 }}
       volumes:
         - hostPath:
             path: {{ .Values.linux.kubelet }}/plugins/{{ .Values.driver.name }}

diff --git a/charts/latest/csi-driver-smb/values.yaml b/charts/latest/csi-driver-smb/values.yaml
@@ -39,21 +39,21 @@ controller:
   resources:
     csiProvisioner:
       limits:
-        cpu: 200m
+        cpu: 1
         memory: 300Mi
       requests:
         cpu: 10m
         memory: 20Mi
     livenessProbe:
       limits:
-        cpu: 100m
+        cpu: 1
         memory: 100Mi
       requests:
         cpu: 10m
         memory: 20Mi
     smb:
       limits:
-        cpu: 200m
+        cpu: 1
         memory: 200Mi
       requests:
         cpu: 10m
@@ -74,37 +74,37 @@ node:
   logLevel: 5
   livenessProbe:
     healthPort: 29643
+  affinity: {}
+  nodeSelector: {}
+
+linux:
+  enabled: true
+  dsName: csi-smb-node # daemonset name
+  kubelet: /var/lib/kubelet
+  tolerations:
+    - operator: "Exists"
   resources:
     livenessProbe:
       limits:
-        cpu: 100m
+        cpu: 1
         memory: 100Mi
       requests:
         cpu: 10m
         memory: 20Mi
     nodeDriverRegistrar:
       limits:
-        cpu: 200m
+        cpu: 1
         memory: 100Mi
       requests:
         cpu: 10m
         memory: 20Mi
     smb:
       limits:
-        cpu: 400m
+        cpu: 1
         memory: 200Mi
       requests:
         cpu: 10m
         memory: 20Mi
-  affinity: {}
-  nodeSelector: {}
-
-linux:
-  enabled: true
-  dsName: csi-smb-node # daemonset name
-  kubelet: /var/lib/kubelet
-  tolerations:
-    - operator: "Exists"
 
 windows:
   enabled: false
@@ -114,6 +114,28 @@ windows:
     - key: "node.kubernetes.io/os"
       operator: "Exists"
       effect: "NoSchedule"
+  resources:
+    livenessProbe:
+      limits:
+        cpu: 1
+        memory: 200Mi
+      requests:
+        cpu: 10m
+        memory: 20Mi
+    nodeDriverRegistrar:
+      limits:
+        cpu: 1
+        memory: 200Mi
+      requests:
+        cpu: 10m
+        memory: 20Mi
+    smb:
+      limits:
+        cpu: 1
+        memory: 400Mi
+      requests:
+        cpu: 10m
+        memory: 20Mi
 
 ## Collection of annotations to add to all the pods
 podAnnotations: {}

diff --git a/deploy/csi-smb-controller.yaml b/deploy/csi-smb-controller.yaml
@@ -41,7 +41,7 @@ spec:
               name: socket-dir
           resources:
             limits:
-              cpu: 100m
+              cpu: 1
               memory: 300Mi
             requests:
               cpu: 10m
@@ -58,7 +58,7 @@ spec:
               mountPath: /csi
           resources:
             limits:
-              cpu: 200m
+              cpu: 1
               memory: 100Mi
             requests:
               cpu: 10m
@@ -95,7 +95,7 @@ spec:
               name: socket-dir
           resources:
             limits:
-              cpu: 200m
+              cpu: 1
               memory: 200Mi
             requests:
               cpu: 10m

diff --git a/deploy/csi-smb-node-windows.yaml b/deploy/csi-smb-node-windows.yaml
@@ -40,7 +40,7 @@ spec:
               value: unix://C:\\csi\\csi.sock
           resources:
             limits:
-              cpu: 200m
+              cpu: 1
               memory: 200Mi
             requests:
               cpu: 10m
@@ -77,7 +77,7 @@ spec:
               mountPath: C:\registration
           resources:
             limits:
-              cpu: 200m
+              cpu: 1
               memory: 200Mi
             requests:
               cpu: 10m
@@ -127,7 +127,7 @@ spec:
               mountPath: \\.\pipe\csi-proxy-smb-v1beta1
           resources:
             limits:
-              cpu: 400m
+              cpu: 1
               memory: 400Mi
             requests:
               cpu: 10m

diff --git a/deploy/csi-smb-node.yaml b/deploy/csi-smb-node.yaml
@@ -37,7 +37,7 @@ spec:
             - --v=2
           resources:
             limits:
-              cpu: 100m
+              cpu: 1
               memory: 100Mi
             requests:
               cpu: 10m
@@ -68,7 +68,7 @@ spec:
               mountPath: /registration
           resources:
             limits:
-              cpu: 200m
+              cpu: 1
               memory: 100Mi
             requests:
               cpu: 10m
@@ -111,7 +111,7 @@ spec:
               name: mountpoint-dir
           resources:
             limits:
-              cpu: 400m
+              cpu: 1
               memory: 200Mi
             requests:
               cpu: 10m