test: set lower log level in e2e test

update chart file update chart files
kubernetes-csi · Feb 11, 2021 · 28da12b · 28da12b
1 parent 2d3ef8a
commit 28da12b
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 7 deletions.
diff --git a/charts/README.md b/charts/README.md
@@ -48,7 +48,9 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
 | `rbac.create`                                     | whether create rbac of csi-smb-controller                  | true                                                              |
 | `controller.replicas`                             | the replicas of csi-smb-controller                                  | 2                                                   |
 | `controller.metricsPort`                          | metrics port of csi-smb-controller                   |29644                                               |
+| `controller.logLevel`                             | controller driver log level                                                          |`5`                                                           |
 | `node.metricsPort`                                | metrics port of csi-smb-node                         |29645
+| `node.logLevel`                                   | node driver log level                                                          |`5`                                                           |
 | `linux.enabled`                                   | whether enable linux feature                               | true                                                              |
 | `windows.enabled`                                 | whether enable windows feature                             | false                                                             |
 | `windows.image.livenessProbe.repository`          | windows liveness-probe docker image                        | mcr.microsoft.com/oss/kubernetes-csi/livenessprobe                |

diff --git a/charts/latest/csi-driver-smb-v0.7.0.tgz b/charts/latest/csi-driver-smb-v0.7.0.tgz
diff --git a/charts/latest/csi-driver-smb/Chart.yaml b/charts/latest/csi-driver-smb/Chart.yaml
diff --git a/charts/latest/csi-driver-smb/templates/NOTES.txt b/charts/latest/csi-driver-smb/templates/NOTES.txt
diff --git a/charts/latest/csi-driver-smb/templates/_helpers.tpl b/charts/latest/csi-driver-smb/templates/_helpers.tpl
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml
@@ -71,7 +71,7 @@ spec:
           image: "{{ .Values.image.smb.repository }}:{{ .Values.image.smb.tag }}"
           imagePullPolicy: {{ .Values.image.smb.pullPolicy }}
           args:
-            - "--v=5"
+            - "--v={{ .Values.controller.logLevel }}"
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--metrics-address=0.0.0.0:{{ .Values.controller.metricsPort }}"
           ports:

diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-driver.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-driver.yaml
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml
@@ -70,7 +70,7 @@ spec:
           image: "{{ .Values.image.smb.repository }}:{{ .Values.image.smb.tag }}"
           imagePullPolicy: {{ .Values.image.smb.pullPolicy }}
           args:
-            - --v=5
+            - "--v={{ .Values.node.logLevel }}"
             - --endpoint=$(CSI_ENDPOINT)
             - --nodeid=$(KUBE_NODE_NAME)
             - "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"

diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml
@@ -73,7 +73,7 @@ spec:
           image: "{{ .Values.image.smb.repository }}:{{ .Values.image.smb.tag }}"
           imagePullPolicy: {{ .Values.image.smb.pullPolicy }}
           args:
-            - "--v=5"
+            - "--v={{ .Values.node.logLevel }}"
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
             - "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"

diff --git a/charts/latest/csi-driver-smb/templates/rbac-csi-smb-controller.yaml b/charts/latest/csi-driver-smb/templates/rbac-csi-smb-controller.yaml
diff --git a/charts/latest/csi-driver-smb/values.yaml b/charts/latest/csi-driver-smb/values.yaml
@@ -26,9 +26,11 @@ controller:
   replicas: 2
   metricsPort: 29644
   runOnMaster: false
+  logLevel: 5
 
 node:
   metricsPort: 29645
+  logLevel: 5
 
 linux:
   enabled: true

diff --git a/pkg/csi-common/utils.go b/pkg/csi-common/utils.go
@@ -108,7 +108,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/csi-common/utils_test.go b/pkg/csi-common/utils_test.go
@@ -261,15 +261,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: "",