From 64088f5221dcc5a87031e1be3ebc14e85b9e5e22 Mon Sep 17 00:00:00 2001
From: Matthew Wong <mattwon@amazon.com>
Date: Wed, 26 May 2021 17:04:29 -0700
Subject: [PATCH] helm chart configurable log verbosity

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

diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
index cde886f318..3f4624328b 100644
--- a/charts/aws-ebs-csi-driver/templates/controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -74,7 +74,7 @@ spec:
             - --http-endpoint={{ . }}
             {{- end }}
             - --logtostderr
-            - --v=2
+            - --v={{ .Values.controller.logLevel }}
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml
index 5ecb93059a..9ee0c45948 100644
--- a/charts/aws-ebs-csi-driver/templates/node.yaml
+++ b/charts/aws-ebs-csi-driver/templates/node.yaml
@@ -62,7 +62,7 @@ spec:
             - --volume-attach-limit={{ . }}
             {{- end }}
             - --logtostderr
-            - --v=2
+            - --v={{ .Values.node.logLevel }}
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
index a6cac89fb1..0f4e0d46fb 100644
--- a/charts/aws-ebs-csi-driver/values.yaml
+++ b/charts/aws-ebs-csi-driver/values.yaml
@@ -78,6 +78,7 @@ controller:
   httpEndpoint:
   # ID of the Kubernetes cluster used for tagging provisioned EBS volumes (optional).
   k8sTagClusterId:
+  logLevel: 2
   nodeSelector: {}
   podAnnotations: {}
   priorityClassName:
@@ -121,7 +122,6 @@ controller:
   #    whenUnsatisfiable: ScheduleAnyway
   topologySpreadConstraints: []
 
-
 # Moving to values under node
 # The "maximum number of attachable volumes" per node
 volumeAttachLimit:
@@ -131,6 +131,7 @@ node:
     ebsPlugin: []
     nodeDriverRegistrar: []
   kubeletPath: /var/lib/kubelet
+  logLevel: 2
   priorityClassName:
   nodeSelector: {}
   podAnnotations: {}
diff --git a/hack/values.yaml b/hack/values.yaml
index 0ff3e8cc91..6d331b8acf 100644
--- a/hack/values.yaml
+++ b/hack/values.yaml
@@ -1 +1,6 @@
-enableVolumeSnapshot: true
\ No newline at end of file
+enableVolumeSnapshot: true
+controller:
+  logLevel: 5
+node:
+  logLevel: 5
+