Commit 8cd8f6b6 authored by Cyrill Troxler's avatar Cyrill Troxler
Browse files

Mounter can now only be specified through flag

parent 9d5d84eb

cmd/s3driver/main.go

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ var ( 
	secretAccessKey = flag.String("secret-access-key", "", "S3 Secret Access Key to use")

	s3endpoint      = flag.String("s3-endpoint", "", "S3 Endpoint URL to use")

	region          = flag.String("region", "", "S3 Region to use")

	mounter         = flag.String("mounter", "s3fs", "Specify which Mounter to use")

	encryptionKey   = flag.String("encryption-key", "", "Encryption key for file system (only used with s3ql)")

)
@@ -46,6 +47,7 @@ func main() { 
		SecretAccessKey: *secretAccessKey,

		Endpoint:        *s3endpoint,

		Region:          *region,

		Mounter:         *mounter,

		EncryptionKey:   *encryptionKey,

	}

deploy/kubernetes/csi-s3-driver.yaml

+6 −0
Original line number Diff line number Diff line
@@ -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

+6 −0
Original line number Diff line number Diff line
@@ -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 −2
Original line number Diff line number Diff line
@@ -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

+0 −5
Original line number Diff line number Diff line
@@ -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