diff --git a/Makefile b/Makefile index 7c171a1c..c01f49e2 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,8 @@ e2e-bootstrap: install-helm --set image.nfs.repository=$(REGISTRY)/$(IMAGENAME) \ --set image.nfs.tag=$(IMAGE_VERSION) \ --set image.nfs.pullPolicy=Always + --set controller.logLevel=8 + --set node.logLevel=8 .PHONY: e2e-teardown e2e-teardown: diff --git a/charts/README.md b/charts/README.md index b554f6ef..f4f5d975 100644 --- a/charts/README.md +++ b/charts/README.md @@ -47,6 +47,8 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `rbac.create` | whether create rbac of csi-nfs-controller | true | | `controller.replicas` | the replicas of csi-nfs-controller | 2 | | `controller.runOnMaster` | run controller on master node | false | +| `controller.logLevel` | controller driver log level |`5` | +| `node.logLevel` | node driver log level |`5` | ## 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 2d31cc10..1a23c87f 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 36338ee6..61b10c99 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml @@ -75,7 +75,7 @@ spec: allowPrivilegeEscalation: true imagePullPolicy: {{ .Values.image.nfs.pullPolicy }} args: - - "-v=5" + - "--v={{ .Values.controller.logLevel }}" - "--nodeid=$(NODE_ID)" - "--endpoint=$(CSI_ENDPOINT)" env: 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 6c621af1..c53d6196 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml @@ -67,7 +67,7 @@ spec: allowPrivilegeEscalation: true image: "{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}" args : - - "-v=5" + - "--v={{ .Values.node.logLevel }}" - "--nodeid=$(NODE_ID)" - "--endpoint=$(CSI_ENDPOINT)" env: diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index 7dca8d70..60d563b7 100644 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -22,3 +22,7 @@ rbac: controller: replicas: 2 runOnMaster: false + logLevel: 5 + +node: + logLevel: 5 \ No newline at end of file diff --git a/pkg/nfs/utils.go b/pkg/nfs/utils.go index 97eb83b3..c2d526ce 100644 --- a/pkg/nfs/utils.go +++ b/pkg/nfs/utils.go @@ -74,7 +74,7 @@ func getLogLevel(method string) int32 { if method == "/csi.v1.Identity/Probe" || method == "/csi.v1.Node/NodeGetCapabilities" || method == "/csi.v1.Node/NodeGetVolumeStats" { - return 10 + return 8 } return 2 } diff --git a/pkg/nfs/utils_test.go b/pkg/nfs/utils_test.go index 1177373d..ca761893 100644 --- a/pkg/nfs/utils_test.go +++ b/pkg/nfs/utils_test.go @@ -91,15 +91,15 @@ func TestGetLogLevel(t *testing.T) { }{ { method: "/csi.v1.Identity/Probe", - level: 10, + level: 8, }, { method: "/csi.v1.Node/NodeGetCapabilities", - level: 10, + level: 8, }, { method: "/csi.v1.Node/NodeGetVolumeStats", - level: 10, + level: 8, }, { method: "",