Mounter can now only be specified through flag

deploy/kubernetes/csi-s3-driver.yaml

@@ -83,6 +83,7 @@ spec:
             - "--secret-access-key=$(SECRET_ACCESS_KEY)"
             - "--s3-endpoint=$(S3_ENDPOINT)"
             - "--region=$(REGION)"
+            - "--mounter=$(MOUNTER)"
             - "--encryption-key=$(ENCRYPTION_KEY)"
             - "--v=4"
           env:
@@ -112,6 +113,11 @@ spec:
                 secretKeyRef:
                   name: csi-s3-secret
                   key: region
+            - name: MOUNTER
+              valueFrom:
+                secretKeyRef:
+                  name: csi-s3-secret
+                  key: mounter
             - name: ENCRYPTION_KEY
               valueFrom:
                 secretKeyRef:

deploy/kubernetes/provisioner.yaml

@@ -87,6 +87,7 @@ spec:
             - "--secret-access-key=$(SECRET_ACCESS_KEY)"
             - "--s3-endpoint=$(S3_ENDPOINT)"
             - "--region=$(REGION)"
+            - "--mounter=$(MOUNTER)"
             - "--encryption-key=$(ENCRYPTION_KEY)"
             - "--v=4"
           env:
@@ -116,6 +117,11 @@ spec:
                 secretKeyRef:
                   name: csi-s3-secret
                   key: region
+            - name: MOUNTER
+              valueFrom:
+                secretKeyRef:
+                  name: csi-s3-secret
+                  key: mounter
             - name: ENCRYPTION_KEY
               valueFrom:
                 secretKeyRef:

deploy/kubernetes/secret.yaml

@@ -6,7 +6,11 @@ stringData:
   accessKeyID: <YOUR_ACCESS_KEY_ID>
   secretAccessKey: <YOUR_SECRET_ACCES_KEY>
   endpoint: <S3_ENDPOINT_URL>
-  # If not on S3, just set it to ""
+  # If not on S3, set it to ""
   region: <S3_REGION>
+  # specify which mounter to use
+  # can be set to s3fs, goofys or s3ql
+  mounter: <MOUNTER>
   # Currently only for s3ql
-  # encryptionKey: <FS encryption key>
+  # If not using s3ql, set it to ""
+  encryptionKey: <FS_ENCRYPTION_KEY>

deploy/kubernetes/storageclass.yaml

@@ -4,8 +4,3 @@ apiVersion: storage.k8s.io/v1
 metadata:
   name: csi-s3
 provisioner: ch.ctrox.csi.s3-driver
-parameters:
-  # specify which mounter to use
-  # can be set to s3fs, goofys or s3ql
-  # s3fs is the default
-  # mounter: s3ql