Merge 5179d3c into d4f2e0c

kubernetes-sigs · Apr 19, 2021 · 71c1d8d · 71c1d8d
2 parents d4f2e0c + 5179d3c
commit 71c1d8d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -59,6 +59,11 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
+{{- if .Values.awsCredentialsSecret }}
+            - name: aws-credentials
+              mountPath: /root/.aws
+              readOnly: true
+{{- end }}
           ports:
             - name: healthz
               containerPort: 9808
@@ -95,4 +100,9 @@ spec:
       volumes:
         - name: socket-dir
           emptyDir: {}
+{{- if .Values.awsCredentialsSecret }}
+        - name: aws-credentials
+          secret:
+            secretName: {{ .Values.awsCredentialsSecretName }}
+{{- end }}
 {{- end }}
diff --git a/charts/aws-efs-csi-driver/templates/node-daemonset.yaml b/charts/aws-efs-csi-driver/templates/node-daemonset.yaml
@@ -87,6 +87,11 @@ spec:
               mountPath: /var/amazon/efs
             - name: efs-utils-config-legacy
               mountPath: /etc/amazon/efs-legacy
+{{- if .Values.awsCredentialsSecret }}
+            - name: aws-credentials
+              mountPath: /root/.aws
+              readOnly: true
+{{- end }}
           ports:
             - name: healthz
               containerPort: 9809
@@ -153,3 +158,8 @@ spec:
           hostPath:
             path: /etc/amazon/efs
             type: DirectoryOrCreate
+{{- if .Values.awsCredentialsSecret }}
+        - name: aws-credentials
+          secret:
+            secretName: {{ .Values.awsCredentialsSecretName }}
+{{- end }}
diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
@@ -95,3 +95,7 @@ storageClasses: []
 #     gidRangeStart: "1000"
 #     gidRangeEnd: "2000"
 #     basePath: "/dynamic_provisioning"
+# Use aws credentials secret instead of relying on eks iam auth or instance profiles
+awsCredentialsSecret: false
+# aws credentials secret name
+awsCredentialsSecretName: aws-efs-csi-driver-credentials