Commit c7abe28a authored by Cyrill Troxler's avatar Cyrill Troxler
Browse files

Allow configuring mounter via storageclass parameter

parent 4b82c939

deploy/kubernetes/csi-s3-driver.yaml

+0 −6
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ spec: 
            - "--secret-access-key=$(SECRET_ACCESS_KEY)"

            - "--s3-endpoint=$(S3_ENDPOINT)"

            - "--region=$(REGION)"

            - "--mounter=$(MOUNTER)"

            - "--encryption-key=$(ENCRYPTION_KEY)"

            - "--v=4"

          env:
@@ -113,11 +112,6 @@ 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

+0 −6
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ spec: 
            - "--secret-access-key=$(SECRET_ACCESS_KEY)"

            - "--s3-endpoint=$(S3_ENDPOINT)"

            - "--region=$(REGION)"

            - "--mounter=$(MOUNTER)"

            - "--encryption-key=$(ENCRYPTION_KEY)"

            - "--v=4"

          env:
@@ -117,11 +116,6 @@ 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

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ stringData: 
  endpoint: <S3_ENDPOINT_URL>

  # 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

  # If not using s3ql, set it to ""

  encryptionKey: <FS_ENCRYPTION_KEY>

deploy/kubernetes/storageclass.yaml

+4 −0
Original line number Diff line number Diff line
@@ -4,3 +4,7 @@ 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 s3backer, s3ql, s3fs or goofys

  mounter: s3backer

pkg/s3/controllerserver.go

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol 
	}



	capacityBytes := int64(req.GetCapacityRange().GetRequiredBytes())

	params := req.GetParameters()

	mounter := params[mounterTypeKey]



	glog.V(5).Infof("Got a request to create bucket %s", volumeID)
@@ -77,6 +79,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol 
	}

	b := &bucket{

		Name:          volumeID,

		Mounter:       mounter,

		CapacityBytes: capacityBytes,

		FSPath:        fsPrefix,

	}