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 f65882e2..23c95dd5 100644 Binary files a/charts/latest/csi-driver-nfs-v3.0.0.tgz and b/charts/latest/csi-driver-nfs-v3.0.0.tgz differ 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