Commit 13eba47d authored by Cyrill Troxler's avatar Cyrill Troxler
Browse files

Add experimental s3ql mounter

parent a1659375

Gopkg.lock

+7 −1
Original line number Diff line number Diff line
@@ -334,6 +334,12 @@ 
  revision = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"

  version = "v1.13.0"



[[projects]]

  name = "gopkg.in/ini.v1"

  packages = ["."]

  revision = "358ee7663966325963d4e8b2e1fbd570c5195153"

  version = "v1.38.1"



[[projects]]

  name = "gopkg.in/yaml.v2"

  packages = ["."]
@@ -366,6 +372,6 @@ 
[solve-meta]

  analyzer-name = "dep"

  analyzer-version = 1

  inputs-digest = "6af116857c3619ed6bf4a8c17b479733db2897293cb13de205ece61f7726b2f4"

  inputs-digest = "9bd4175acb8ce47fe57c3d859bc6b061a6c5dd3017f57777f3fefb27d0020d75"

  solver-name = "gps-cdcl"

  solver-version = 1

Gopkg.toml

+4 −0
Original line number Diff line number Diff line
@@ -37,3 +37,7 @@ 
[prune]

  go-tests = true

  unused-packages = true



[[constraint]]

  name = "gopkg.in/ini.v1"

  version = "1.38.1"

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
PROJECT_DIR=/go/src/github.com/ctrox/csi-s3-driver

REGISTRY_NAME=ctrox

IMAGE_NAME=csi-s3-driver

IMAGE_VERSION=0.1.0

IMAGE_VERSION=0.2.0

IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)

TEST_IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):test
@@ -27,7 +27,7 @@ test: 
	docker build -t $(TEST_IMAGE_TAG) -f test/Dockerfile .

	docker run --rm --privileged -v $(PWD):$(PROJECT_DIR):ro -v /dev:/dev $(TEST_IMAGE_TAG)

container: build

	docker build -t $(IMAGE_TAG) -f cmd/s3driver/Dockerfile .

	docker build -t $(IMAGE_TAG) -f cmd/s3driver/Dockerfile.s3ql .

push: container

	docker push $(IMAGE_TAG)

clean:

cmd/s3driver/Dockerfile.s3ql

0 → 100644
+23 −0
Original line number Diff line number Diff line 
FROM debian:stretch

LABEL maintainers="Cyrill Troxler <cyrilltroxler@gmail.com>"

LABEL description="s3 fuse csi plugin"

ARG S3QL_VERSION=release-2.28



RUN apt-get update && \

    apt-get install -y \

      s3fs wget python3 python3-setuptools \

      python3-dev python3-pip python3-llfuse pkg-config \

      sqlite3 libsqlite3-dev python3-apsw cython && \

    rm -rf /var/lib/apt/lists/*



RUN pip3 install defusedxml dugong requests pycrypto



WORKDIR /usr/src

RUN wget -q https://github.com/s3ql/s3ql/archive/${S3QL_VERSION}.tar.gz

RUN tar -xzf ${S3QL_VERSION}.tar.gz

WORKDIR /usr/src/s3ql-${S3QL_VERSION}

RUN python3 setup.py build_cython build_ext --inplace

RUN python3 setup.py install



COPY ./_output/s3driver /s3driver

ENTRYPOINT ["/s3driver"]

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")

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

)



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

		Endpoint:        *s3endpoint,

		Region:          *region,

		EncryptionKey:   *encryptionKey,

	}



	driver, err := s3.NewS3(*nodeID, *endpoint, cfg)