From 19804539da1163d3ceef7c689985d886966ed824 Mon Sep 17 00:00:00 2001
From: Karsten Siemer <karsten.siemer@sda.se>
Date: Wed, 14 Apr 2021 11:13:34 +0200
Subject: [PATCH 1/2] feat: add helm config to enable deleteAccessPointRootDir

---
 .../templates/controller-deployment.yaml                   | 7 +++----
 charts/aws-efs-csi-driver/values.yaml                      | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
index d1c9901b7..933b839f1 100644
--- a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
+++ b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -52,9 +52,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={{ .Values.logLevel }}
+            - --delete-access-point-root-dir={{ hasKey .Values.controller "deleteAccessPointRootDir" | ternary .Values.controller.deleteAccessPointRootDir false }}
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
@@ -77,7 +76,7 @@ spec:
           image: {{ printf "%s:%s" .Values.sidecars.csiProvisionerImage.repository .Values.sidecars.csiProvisionerImage.tag }}
           args:
             - --csi-address=$(ADDRESS)
-            - --v=5
+            - --v={{ .Values.logLevel }}
             - --feature-gates=Topology=true
             - --leader-election
           env:
diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
index e7dfaa90c..a43aa6795 100644
--- a/charts/aws-efs-csi-driver/values.yaml
+++ b/charts/aws-efs-csi-driver/values.yaml
@@ -82,6 +82,9 @@ serviceAccount:
 
 controller:
   create: true
+  # Enable if you want the controller to also delete the
+  # path on efs when deleteing an access point
+  deleteAccessPointRootDir: false
 
 storageClasses: []
 # Add StorageClass resources like:

From 274be8159a7a7be3b833fa392865fd6c44fab6de Mon Sep 17 00:00:00 2001
From: Karsten Siemer <karsten.siemer@sda.se>
Date: Wed, 14 Apr 2021 12:35:37 +0200
Subject: [PATCH 2/2] bump chart version

---
 charts/aws-efs-csi-driver/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/aws-efs-csi-driver/Chart.yaml b/charts/aws-efs-csi-driver/Chart.yaml
index fabd7b642..c97f49c97 100644
--- a/charts/aws-efs-csi-driver/Chart.yaml
+++ b/charts/aws-efs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.2.0"
 name: aws-efs-csi-driver
 description: A Helm chart for AWS EFS CSI Driver
-version: 1.2.1
+version: 1.2.2
 kubeVersion: ">=1.17.0-0"
 home: https://github.com/kubernetes-sigs/aws-efs-csi-driver
 sources: