From b4da7fc79c23e3a270f9d2a3787e885d97f5e8aa Mon Sep 17 00:00:00 2001
From: Karsten Siemer <karsten.siemer@sda.se>
Date: Wed, 14 Apr 2021 15:32:28 +0200
Subject: [PATCH 1/2] feat: addcontroller access point tags to helm chart

---
 charts/aws-efs-csi-driver/Chart.yaml                  |  2 +-
 charts/aws-efs-csi-driver/templates/_helpers.tpl      | 11 +++++++++++
 .../templates/controller-deployment.yaml              |  3 +++
 charts/aws-efs-csi-driver/values.yaml                 |  4 ++++
 4 files changed, 19 insertions(+), 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:
diff --git a/charts/aws-efs-csi-driver/templates/_helpers.tpl b/charts/aws-efs-csi-driver/templates/_helpers.tpl
index f0a743d79..01793e89c 100644
--- a/charts/aws-efs-csi-driver/templates/_helpers.tpl
+++ b/charts/aws-efs-csi-driver/templates/_helpers.tpl
@@ -54,3 +54,14 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.controller.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create a string out of the map for controller tags flag
+*/}}
+{{- define "aws-efs-csi-driver.tags" -}}
+{{- $tags := list -}}
+{{ range $key, $val := .Values.controller.tags }}
+{{- $tags = print $key ":" $val | append $tags -}}
+{{- end -}}
+{{- join " " $tags | quote -}}
+{{- end -}}
diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
index d1c9901b7..8b555030e 100644
--- a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
+++ b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -55,6 +55,9 @@ spec:
             - --v=5
             # Uncomment below line to allow access point root directory to be deleted by controller.
             #- --delete-access-point-root-dir
+            {{- if .Values.controller.tags }}
+            - --tags={{ include "aws-efs-csi-driver.tags" . }}
+            {{- end }}
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
index e7dfaa90c..e40747be0 100644
--- a/charts/aws-efs-csi-driver/values.yaml
+++ b/charts/aws-efs-csi-driver/values.yaml
@@ -82,6 +82,10 @@ serviceAccount:
 
 controller:
   create: true
+  # Add additional tags to access points
+  tags: {}
+    #  environment: prod
+    #  region: us-east-1
 
 storageClasses: []
 # Add StorageClass resources like:

From 56c373b3ed1bda1583efd19b0774e4ffa0291df1 Mon Sep 17 00:00:00 2001
From: Karsten Siemer <karsten.siemer@sda.se>
Date: Wed, 14 Apr 2021 15:35:10 +0200
Subject: [PATCH 2/2] only pass needed context to helper

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

diff --git a/charts/aws-efs-csi-driver/templates/_helpers.tpl b/charts/aws-efs-csi-driver/templates/_helpers.tpl
index 01793e89c..f3fe5f424 100644
--- a/charts/aws-efs-csi-driver/templates/_helpers.tpl
+++ b/charts/aws-efs-csi-driver/templates/_helpers.tpl
@@ -60,7 +60,7 @@ Create a string out of the map for controller tags flag
 */}}
 {{- define "aws-efs-csi-driver.tags" -}}
 {{- $tags := list -}}
-{{ range $key, $val := .Values.controller.tags }}
+{{ range $key, $val := . }}
 {{- $tags = print $key ":" $val | append $tags -}}
 {{- end -}}
 {{- join " " $tags | quote -}}
diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
index 8b555030e..83adfe31e 100644
--- a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
+++ b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -56,7 +56,7 @@ spec:
             # Uncomment below line to allow access point root directory to be deleted by controller.
             #- --delete-access-point-root-dir
             {{- if .Values.controller.tags }}
-            - --tags={{ include "aws-efs-csi-driver.tags" . }}
+            - --tags={{ include "aws-efs-csi-driver.tags" .Values.controller.tags }}
             {{- end }}
           env:
             - name: CSI_ENDPOINT
diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
index e40747be0..b44bed820 100644
--- a/charts/aws-efs-csi-driver/values.yaml
+++ b/charts/aws-efs-csi-driver/values.yaml
@@ -84,8 +84,8 @@ controller:
   create: true
   # Add additional tags to access points
   tags: {}
-    #  environment: prod
-    #  region: us-east-1
+    # environment: prod
+    # region: us-east-1
 
 storageClasses: []
 # Add StorageClass resources like: