From cb59f1453b9514b15e0d7123edfc93531b67f879 Mon Sep 17 00:00:00 2001
From: Michal Schott <michal.schott@onegini.com>
Date: Thu, 8 Jul 2021 11:54:58 +0200
Subject: [PATCH] Better control over log verbosity.

---
 charts/aws-ebs-csi-driver/templates/controller.yaml        | 7 ++++---
 charts/aws-ebs-csi-driver/templates/node-windows.yaml      | 5 +++--
 charts/aws-ebs-csi-driver/templates/node.yaml              | 3 ++-
 .../aws-ebs-csi-driver/templates/snapshot-controller.yaml  | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
index 5623cd449d..956de588f6 100644
--- a/charts/aws-ebs-csi-driver/templates/controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -147,7 +147,7 @@ spec:
           image: {{ printf "%s:%s" .Values.sidecars.provisionerImage.repository .Values.sidecars.provisionerImage.tag }}
           args:
             - --csi-address=$(ADDRESS)
-            - --v=5
+            - --v={{ .Values.controller.logLevel }}
             - --feature-gates=Topology=true
             {{- if or .Values.controller.extraCreateMetadata .Values.extraCreateMetadata }}
             - --extra-create-metadata
@@ -174,7 +174,7 @@ spec:
           image: {{ printf "%s:%s" .Values.sidecars.attacherImage.repository .Values.sidecars.attacherImage.tag }}
           args:
             - --csi-address=$(ADDRESS)
-            - --v=5
+            - --v={{ .Values.controller.logLevel }}
             - --leader-election=true
           env:
             - name: ADDRESS
@@ -220,7 +220,7 @@ spec:
           imagePullPolicy: Always
           args:
             - --csi-address=$(ADDRESS)
-            - --v=5
+            - --v={{ .Values.controller.logLevel }}
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -241,6 +241,7 @@ spec:
           image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }}
           args:
             - --csi-address=/csi/csi.sock
+            - -v {{ .Values.controller.logLevel }}
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
diff --git a/charts/aws-ebs-csi-driver/templates/node-windows.yaml b/charts/aws-ebs-csi-driver/templates/node-windows.yaml
index b6cde40d7b..33ce5aa4eb 100644
--- a/charts/aws-ebs-csi-driver/templates/node-windows.yaml
+++ b/charts/aws-ebs-csi-driver/templates/node-windows.yaml
@@ -58,7 +58,7 @@ spec:
             - --volume-attach-limit={{ .Values.volumeAttachLimit }}
             {{- end }}
             - --logtostderr
-            - --v=5
+            - --v={{ .Values.node.logLevel }}
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
@@ -108,7 +108,7 @@ spec:
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            - --v=5
+            - --v={{ .Values.nodeWindows.logLevel }}
           env:
             - name: ADDRESS
               value: unix:/csi/csi.sock
@@ -140,6 +140,7 @@ spec:
           image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }}
           args:
             - --csi-address=unix:/csi/csi.sock
+            - -v {{ .Values.node.logLevel }}
           volumeMounts:
             - name: plugin-dir
               mountPath: C:\csi
diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml
index 556710a39a..f46befc78e 100644
--- a/charts/aws-ebs-csi-driver/templates/node.yaml
+++ b/charts/aws-ebs-csi-driver/templates/node.yaml
@@ -107,7 +107,7 @@ spec:
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            - --v=5
+            - --v={{ .Values.node.logLevel }}
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -132,6 +132,7 @@ spec:
           image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }}
           args:
             - --csi-address=/csi/csi.sock
+            - -v {{ .Values.node.logLevel }}
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
diff --git a/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml b/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml
index bc078f6dd3..8d40bb4d22 100644
--- a/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml
@@ -65,4 +65,4 @@ spec:
         - name: {{ . }}
       {{- end }}
       {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}