kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #259 from andyzhangx/remove-cpu-limits2

Browse Source 
cleanup: remove cpu limits
This commit is contained in:
Andy Zhang 2021-12-27 15:51:57 +08:00 committed by GitHub
commit d6c19e714a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/README.md
View File

@ -59,15 +59,12 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
| `controller.runOnMaster` | run controller on master node | `false` | | `controller.runOnMaster` | run controller on master node | `false` |
| `controller.logLevel` | controller driver log level |`5` | | `controller.logLevel` | controller driver log level |`5` |
| `controller.tolerations` | controller pod tolerations | | | `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.limits.memory` | csi-provisioner memory limits | 100Mi |
| `controller.resources.csiProvisioner.requests.cpu` | csi-provisioner cpu requests limits | 10m | | `controller.resources.csiProvisioner.requests.cpu` | csi-provisioner cpu requests limits | 10m |
| `controller.resources.csiProvisioner.requests.memory` | csi-provisioner memory requests limits | 20Mi | | `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.limits.memory` | liveness-probe memory limits | 100Mi |
| `controller.resources.livenessProbe.requests.cpu` | liveness-probe cpu requests limits | 10m | | `controller.resources.livenessProbe.requests.cpu` | liveness-probe cpu requests limits | 10m |
| `controller.resources.livenessProbe.requests.memory` | liveness-probe memory requests limits | 20Mi | | `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.limits.memory` | csi-driver-nfs memory limits | 200Mi |
| `controller.resources.nfs.requests.cpu` | csi-driver-nfs cpu requests limits | 10m | | `controller.resources.nfs.requests.cpu` | csi-driver-nfs cpu requests limits | 10m |
| `controller.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi | | `controller.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi |
@ -76,15 +73,12 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
| `node.logLevel` | node driver log level |`5` | | `node.logLevel` | node driver log level |`5` |
| `node.livenessProbe.healthPort ` | the health check port for liveness probe |`29653` | | `node.livenessProbe.healthPort ` | the health check port for liveness probe |`29653` |
| `node.tolerations` | node pod tolerations | | | `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.limits.memory` | liveness-probe memory limits | 100Mi |
| `node.resources.livenessProbe.requests.cpu` | liveness-probe cpu requests limits | 10m | | `node.resources.livenessProbe.requests.cpu` | liveness-probe cpu requests limits | 10m |
| `node.resources.livenessProbe.requests.memory` | liveness-probe memory requests limits | 20Mi | | `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.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.cpu` | csi-node-driver-registrar cpu requests limits | 10m |
| `node.resources.nodeDriverRegistrar.requests.memory` | csi-node-driver-registrar memory requests limits | 20Mi | | `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.limits.memory` | csi-driver-nfs memory limits | 300Mi |
| `node.resources.nfs.requests.cpu` | csi-driver-nfs cpu requests limits | 10m | | `node.resources.nfs.requests.cpu` | csi-driver-nfs cpu requests limits | 10m |
| `node.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi | | `node.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi |

BIN
charts/latest/csi-driver-nfs-v3.1.0.tgz
View File

Binary file not shown.

6
charts/latest/csi-driver-nfs/values.yaml
View File

@ -48,21 +48,18 @@ controller:
resources: resources:
csiProvisioner: csiProvisioner:
limits: limits:
cpu: 1
memory: 400Mi memory: 400Mi
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi
livenessProbe: livenessProbe:
limits: limits:
cpu: 1
memory: 100Mi memory: 100Mi
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi
nfs: nfs:
limits: limits:
cpu: 1
memory: 200Mi memory: 200Mi
requests: requests:
cpu: 10m cpu: 10m
@ -79,21 +76,18 @@ node:
resources: resources:
livenessProbe: livenessProbe:
limits: limits:
cpu: 1
memory: 100Mi memory: 100Mi
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi
nodeDriverRegistrar: nodeDriverRegistrar:
limits: limits:
cpu: 1
memory: 100Mi memory: 100Mi
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi
nfs: nfs:
limits: limits:
cpu: 1
memory: 300Mi memory: 300Mi
requests: requests:
cpu: 10m cpu: 10m

3
deploy/csi-nfs-controller.yaml
View File

@ -42,7 +42,6 @@ spec:
name: socket-dir name: socket-dir
resources: resources:
limits: limits:
cpu: 1
memory: 400Mi memory: 400Mi
requests: requests:
cpu: 10m cpu: 10m
@ -59,7 +58,6 @@ spec:
mountPath: /csi mountPath: /csi
resources: resources:
limits: limits:
cpu: 1
memory: 100Mi memory: 100Mi
requests: requests:
cpu: 10m cpu: 10m
@ -103,7 +101,6 @@ spec:
name: socket-dir name: socket-dir
resources: resources:
limits: limits:
cpu: 1
memory: 200Mi memory: 200Mi
requests: requests:
cpu: 10m cpu: 10m

3
deploy/csi-nfs-node.yaml
View File

@ -38,7 +38,6 @@ spec:
mountPath: /csi mountPath: /csi
resources: resources:
limits: limits:
cpu: 1
memory: 100Mi memory: 100Mi
requests: requests:
cpu: 10m cpu: 10m
@ -71,7 +70,6 @@ spec:
mountPath: /registration mountPath: /registration
resources: resources:
limits: limits:
cpu: 1
memory: 100Mi memory: 100Mi
requests: requests:
cpu: 10m cpu: 10m
@ -115,7 +113,6 @@ spec:
mountPropagation: "Bidirectional" mountPropagation: "Bidirectional"
resources: resources:
limits: limits:
cpu: 1
memory: 300Mi memory: 300Mi
requests: requests:
cpu: 10m cpu: 10m

2
pkg/nfs/nodeserver.go
View File

@ -87,7 +87,7 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
} }
if ns.Driver.perm != nil { if ns.Driver.perm != nil {
klog.V(2).Infof("volumeID(%v): mount targetPath(%s) with permissions(%o)", volumeID, targetPath, *ns.Driver.perm) klog.V(2).Infof("volumeID(%v): mount targetPath(%s) with permissions(0%o)", volumeID, targetPath, *ns.Driver.perm)
if err := os.Chmod(targetPath, os.FileMode(*ns.Driver.perm)); err != nil { if err := os.Chmod(targetPath, os.FileMode(*ns.Driver.perm)); err != nil {
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }