From a65585c2be23adf98577ff70508a12b1bf16aaee Mon Sep 17 00:00:00 2001
From: Matthew Wong <mattwon@amazon.com>
Date: Tue, 27 Apr 2021 11:59:53 -0700
Subject: [PATCH] Reduce default log level to 2

---
 charts/aws-efs-csi-driver/values.yaml                 | 5 +++--
 deploy/kubernetes/base/controller-deployment.yaml     | 7 +++----
 deploy/kubernetes/base/controller-serviceaccount.yaml | 2 +-
 deploy/kubernetes/base/node-daemonset.yaml            | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
index a8e0377ee..3814c26c7 100644
--- a/charts/aws-efs-csi-driver/values.yaml
+++ b/charts/aws-efs-csi-driver/values.yaml
@@ -49,7 +49,7 @@ node:
   podAnnotations: {}
   tolerations: []
 
-logLevel: 5
+logLevel: 2
 
 hostAliases:
   {}
@@ -83,7 +83,8 @@ serviceAccount:
 controller:
   create: true
   # Add additional tags to access points
-  tags: {}
+  tags:
+    {}
     # environment: prod
     # region: us-east-1
   # Enable if you want the controller to also delete the
diff --git a/deploy/kubernetes/base/controller-deployment.yaml b/deploy/kubernetes/base/controller-deployment.yaml
index d2dc02149..3244c08fb 100644
--- a/deploy/kubernetes/base/controller-deployment.yaml
+++ b/deploy/kubernetes/base/controller-deployment.yaml
@@ -37,9 +37,8 @@ spec:
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
-            - --v=5
-            # Uncomment below line to allow access point root directory to be deleted by controller.
-            #- --delete-access-point-root-dir
+            - --v=2
+            - --delete-access-point-root-dir=false
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
@@ -62,7 +61,7 @@ spec:
           image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v2.1.1-eks-1-18-2
           args:
             - --csi-address=$(ADDRESS)
-            - --v=5
+            - --v=2
             - --feature-gates=Topology=true
             - --leader-election
           env:
diff --git a/deploy/kubernetes/base/controller-serviceaccount.yaml b/deploy/kubernetes/base/controller-serviceaccount.yaml
index 0c2e0ffe2..9ae6671e4 100644
--- a/deploy/kubernetes/base/controller-serviceaccount.yaml
+++ b/deploy/kubernetes/base/controller-serviceaccount.yaml
@@ -47,7 +47,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: efs-csi-controller-sa
-    namespace: sample
+    namespace: default
 roleRef:
   kind: ClusterRole
   name: efs-csi-external-provisioner-role
diff --git a/deploy/kubernetes/base/node-daemonset.yaml b/deploy/kubernetes/base/node-daemonset.yaml
index cd28c61d9..6c202f400 100644
--- a/deploy/kubernetes/base/node-daemonset.yaml
+++ b/deploy/kubernetes/base/node-daemonset.yaml
@@ -43,7 +43,7 @@ spec:
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
-            - --v=5
+            - --v=2
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
@@ -76,7 +76,7 @@ spec:
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            - --v=5
+            - --v=2
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -96,7 +96,7 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --health-port=9809
-            - --v=5
+            - --v=2
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi