Merge pull request #585 from holmesb/bh/regional_sts_endpoints

Conditionally added AWS_STS_REGIONAL_ENDPOINTS flag
kubernetes-sigs · Mar 10, 2022 · b666822 · b666822
2 parents 573e172 + 944c6db
commit b666822
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/charts/aws-efs-csi-driver/CHANGELOG.md b/charts/aws-efs-csi-driver/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Helm chart
 
+# v2.2.4
+* Add STS regional endpoints flag to fix PV creation on private EKS
+
 # v2.2.3
 * Bump app/driver version to `v1.3.6`
 

diff --git a/charts/aws-efs-csi-driver/Chart.yaml b/charts/aws-efs-csi-driver/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: aws-efs-csi-driver
-version: 2.2.2
+version: 2.2.4
 appVersion: 1.3.6
 kubeVersion: ">=1.17.0-0"
 description: "A Helm chart for AWS EFS CSI Driver"

diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -58,6 +58,10 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
+            {{- if .Values.controller.regionalStsEndpoints }}
+            - name: AWS_STS_REGIONAL_ENDPOINTS
+              value: regional
+            {{- end }}
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/

diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
@@ -76,7 +76,7 @@ controller:
     ## Enable if EKS IAM for SA is used
     #  eks.amazonaws.com/role-arn: arn:aws:iam::111122223333:role/efs-csi-role
   healthPort: 9909
-
+  regionalStsEndpoints: false
 ## Node daemonset variables
 
 node: