From 0908ad4f5dd68b25f09292850c46400c34a06c38 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Wed, 24 Nov 2021 15:07:51 +0000 Subject: [PATCH] feat: incrase sidecar container cpu limits --- charts/README.md | 24 ++++++++++ charts/latest/csi-driver-nfs-v3.0.0.tgz | Bin 3457 -> 3507 bytes .../templates/csi-nfs-controller.yaml | 24 ++-------- .../templates/csi-nfs-node.yaml | 24 ++-------- charts/latest/csi-driver-nfs/values.yaml | 44 ++++++++++++++++++ deploy/csi-nfs-controller.yaml | 6 +-- deploy/csi-nfs-node.yaml | 6 +-- 7 files changed, 80 insertions(+), 48 deletions(-) diff --git a/charts/README.md b/charts/README.md index 7ee51fec..3adfe6a9 100644 --- a/charts/README.md +++ b/charts/README.md @@ -64,10 +64,34 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `controller.runOnMaster` | run controller on master node | `false` | | `controller.logLevel` | controller driver log level |`5` | | `controller.tolerations` | controller pod tolerations | | +| `controller.resources.csiProvisioner.limits.cpu` | csi-provisioner cpu limits | 1 | +| `controller.resources.csiProvisioner.limits.memory` | csi-provisioner memory limits | 100Mi | +| `controller.resources.csiProvisioner.requests.cpu` | csi-provisioner cpu requests limits | 10m | +| `controller.resources.csiProvisioner.requests.memory` | csi-provisioner memory requests limits | 20Mi | +| `controller.resources.livenessProbe.limits.cpu` | liveness-probe cpu limits | 1 | +| `controller.resources.livenessProbe.limits.memory` | liveness-probe memory limits | 100Mi | +| `controller.resources.livenessProbe.requests.cpu` | liveness-probe cpu requests limits | 10m | +| `controller.resources.livenessProbe.requests.memory` | liveness-probe memory requests limits | 20Mi | +| `controller.resources.nfs.limits.cpu` | csi-driver-nfs cpu limits | 1 | +| `controller.resources.nfs.limits.memory` | csi-driver-nfs memory limits | 200Mi | +| `controller.resources.nfs.requests.cpu` | csi-driver-nfs cpu requests limits | 10m | +| `controller.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi | | `node.maxUnavailable` | `maxUnavailable` value of driver node daemonset | `1` | `node.logLevel` | node driver log level |`5` | | `node.livenessProbe.healthPort ` | the health check port for liveness probe |`29653` | | `node.tolerations` | node pod tolerations | | +| `node.resources.livenessProbe.limits.cpu` | liveness-probe cpu limits | 1 | +| `node.resources.livenessProbe.limits.memory` | liveness-probe memory limits | 100Mi | +| `node.resources.livenessProbe.requests.cpu` | liveness-probe cpu requests limits | 10m | +| `node.resources.livenessProbe.requests.memory` | liveness-probe memory requests limits | 20Mi | +| `node.resources.nodeDriverRegistrar.limits.cpu` | csi-node-driver-registrar cpu limits | 1 | +| `node.resources.nodeDriverRegistrar.limits.memory` | csi-node-driver-registrar memory limits | 100Mi | +| `node.resources.nodeDriverRegistrar.requests.cpu` | csi-node-driver-registrar cpu requests limits | 10m | +| `node.resources.nodeDriverRegistrar.requests.memory` | csi-node-driver-registrar memory requests limits | 20Mi | +| `node.resources.nfs.limits.cpu` | csi-driver-nfs cpu limits | 1 | +| `node.resources.nfs.limits.memory` | csi-driver-nfs memory limits | 300Mi | +| `node.resources.nfs.requests.cpu` | csi-driver-nfs cpu requests limits | 10m | +| `node.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi | ## troubleshooting - Add `--wait -v=5 --debug` in `helm install` command to get detailed error diff --git a/charts/latest/csi-driver-nfs-v3.0.0.tgz b/charts/latest/csi-driver-nfs-v3.0.0.tgz index f65882e2f0058062989302a84e48af4e685132bf..23c95dd5ac9e86962b5a49eae714fd208b17ce01 100644 GIT binary patch delta 3481 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 H09F71BJs~? delta 3430 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�uv5G{D%}wmvv`yQzZ=n5u00030|GZe( IOaN8@0Md`wvj6}9 diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml index 9fbf4770..f0f932bc 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml @@ -46,13 +46,7 @@ spec: volumeMounts: - mountPath: /csi name: socket-dir - resources: - limits: - cpu: 200m - memory: 400Mi - requests: - cpu: 10m - memory: 20Mi + resources: {{- toYaml .Values.controller.resources.csiProvisioner | nindent 12 }} - name: liveness-probe image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}" args: @@ -64,13 +58,7 @@ spec: volumeMounts: - name: socket-dir mountPath: /csi - resources: - limits: - cpu: 100m - memory: 100Mi - requests: - cpu: 10m - memory: 20Mi + resources: {{- toYaml .Values.controller.resources.livenessProbe | nindent 12 }} - name: nfs image: "{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}" securityContext: @@ -109,13 +97,7 @@ spec: mountPropagation: "Bidirectional" - mountPath: /csi name: socket-dir - resources: - limits: - cpu: 200m - memory: 200Mi - requests: - cpu: 10m - memory: 20Mi + resources: {{- toYaml .Values.controller.resources.nfs | nindent 12 }} volumes: - name: pods-mount-dir hostPath: diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml index 8526912d..3cb29d0f 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml @@ -43,13 +43,7 @@ spec: volumeMounts: - name: socket-dir mountPath: /csi - resources: - limits: - cpu: 100m - memory: 100Mi - requests: - cpu: 10m - memory: 20Mi + resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }} - name: node-driver-registrar image: "{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}" livenessProbe: @@ -77,13 +71,7 @@ spec: mountPath: /csi - name: registration-dir mountPath: /registration - resources: - limits: - cpu: 200m - memory: 100Mi - requests: - cpu: 10m - memory: 20Mi + resources: {{- toYaml .Values.node.resources.nodeDriverRegistrar | nindent 12 }} - name: nfs securityContext: privileged: true @@ -122,13 +110,7 @@ spec: - name: pods-mount-dir mountPath: /var/lib/kubelet/pods mountPropagation: "Bidirectional" - resources: - limits: - cpu: 400m - memory: 300Mi - requests: - cpu: 10m - memory: 20Mi + resources: {{- toYaml .Values.node.resources.nfs | nindent 12 }} volumes: - name: socket-dir hostPath: diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index bfd85c74..de9e1334 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -38,6 +38,28 @@ controller: - key: "node-role.kubernetes.io/controlplane" operator: "Exists" effect: "NoSchedule" + resources: + csiProvisioner: + limits: + cpu: 1 + memory: 400Mi + requests: + cpu: 10m + memory: 20Mi + livenessProbe: + limits: + cpu: 1 + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi + nfs: + limits: + cpu: 1 + memory: 200Mi + requests: + cpu: 10m + memory: 20Mi node: name: csi-nfs-node @@ -47,6 +69,28 @@ node: healthPort: 29653 tolerations: - operator: "Exists" + resources: + livenessProbe: + limits: + cpu: 1 + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi + nodeDriverRegistrar: + limits: + cpu: 1 + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi + nfs: + limits: + cpu: 1 + memory: 300Mi + requests: + cpu: 10m + memory: 20Mi feature: enableFSGroupPolicy: false diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml index 38e51259..93f4b53a 100644 --- a/deploy/csi-nfs-controller.yaml +++ b/deploy/csi-nfs-controller.yaml @@ -42,7 +42,7 @@ spec: name: socket-dir resources: limits: - cpu: 200m + cpu: 1 memory: 400Mi requests: cpu: 10m @@ -59,7 +59,7 @@ spec: mountPath: /csi resources: limits: - cpu: 100m + cpu: 1 memory: 100Mi requests: cpu: 10m @@ -103,7 +103,7 @@ spec: name: socket-dir resources: limits: - cpu: 200m + cpu: 1 memory: 200Mi requests: cpu: 10m diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml index 3f5d3e36..821a3db4 100644 --- a/deploy/csi-nfs-node.yaml +++ b/deploy/csi-nfs-node.yaml @@ -38,7 +38,7 @@ spec: mountPath: /csi resources: limits: - cpu: 100m + cpu: 1 memory: 100Mi requests: cpu: 10m @@ -71,7 +71,7 @@ spec: mountPath: /registration resources: limits: - cpu: 200m + cpu: 1 memory: 100Mi requests: cpu: 10m @@ -115,7 +115,7 @@ spec: mountPropagation: "Bidirectional" resources: limits: - cpu: 400m + cpu: 1 memory: 300Mi requests: cpu: 10m