diff --git a/charts/README.md b/charts/README.md index 21416c5c..b5eb43fb 100644 --- a/charts/README.md +++ b/charts/README.md @@ -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.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 | @@ -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.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 | diff --git a/charts/latest/csi-driver-nfs-v3.1.0.tgz b/charts/latest/csi-driver-nfs-v3.1.0.tgz index 504e516b..9716a4e2 100644 Binary files a/charts/latest/csi-driver-nfs-v3.1.0.tgz and b/charts/latest/csi-driver-nfs-v3.1.0.tgz differ diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index 42a2fa25..17a862f7 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -48,21 +48,18 @@ controller: 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 @@ -79,21 +76,18 @@ node: 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 diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml index 93f4b53a..b934d13a 100644 --- a/deploy/csi-nfs-controller.yaml +++ b/deploy/csi-nfs-controller.yaml @@ -42,7 +42,6 @@ spec: name: socket-dir resources: limits: - cpu: 1 memory: 400Mi requests: cpu: 10m @@ -59,7 +58,6 @@ spec: mountPath: /csi resources: limits: - cpu: 1 memory: 100Mi requests: cpu: 10m @@ -103,7 +101,6 @@ spec: name: socket-dir resources: limits: - cpu: 1 memory: 200Mi requests: cpu: 10m diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml index 821a3db4..4a413a43 100644 --- a/deploy/csi-nfs-node.yaml +++ b/deploy/csi-nfs-node.yaml @@ -38,7 +38,6 @@ spec: mountPath: /csi resources: limits: - cpu: 1 memory: 100Mi requests: cpu: 10m @@ -71,7 +70,6 @@ spec: mountPath: /registration resources: limits: - cpu: 1 memory: 100Mi requests: cpu: 10m @@ -115,7 +113,6 @@ spec: mountPropagation: "Bidirectional" resources: limits: - cpu: 1 memory: 300Mi requests: cpu: 10m diff --git a/pkg/nfs/nodeserver.go b/pkg/nfs/nodeserver.go index 68834ac7..e3643c5c 100644 --- a/pkg/nfs/nodeserver.go +++ b/pkg/nfs/nodeserver.go @@ -87,7 +87,7 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis } 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 { return nil, status.Error(codes.Internal, err.Error()) }