Unverified Commit 0433ead3 authored by Cyrill Troxler's avatar Cyrill Troxler Committed by GitHub
Browse files

Merge pull request #47 from Boxjan/master 

* use rclone 1.54.1
* if removeBucket or removePrefix failed, fsmeta is not deleted
* fix removeObjects error check
* add removeObjectsOneByOne as a fallback when removeObjects fails
* fix repeat in yaml
parents ebffbeb5 8449c1e2

cmd/s3driver/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ RUN apt-get update && \ 
  rm -rf /var/lib/apt/lists/*



# install rclone

ARG RCLONE_VERSION=v1.47.0

ARG RCLONE_VERSION=v1.54.1

RUN cd /tmp \

  && curl -O https://downloads.rclone.org/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-linux-amd64.zip \

  && unzip /tmp/rclone-${RCLONE_VERSION}-linux-amd64.zip \

cmd/s3driver/Dockerfile.full

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ RUN apt-get update && \ 
  rm -rf /var/lib/apt/lists/*



# install rclone

ARG RCLONE_VERSION=v1.47.0

ARG RCLONE_VERSION=v1.54.1

RUN cd /tmp \

  && curl -O https://downloads.rclone.org/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-linux-amd64.zip \

  && unzip /tmp/rclone-${RCLONE_VERSION}-linux-amd64.zip \

deploy/kubernetes/attacher.yaml

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ metadata: 
  name: csi-attacher-s3

  namespace: kube-system

spec:

  selector:

    matchLabels:

      app: "csi-attacher-s3"

  serviceName: "csi-attacher-s3"

  replicas: 1

  selector:

deploy/kubernetes/csi-s3.yaml

+1 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ spec: 
              add: ["SYS_ADMIN"]

            allowPrivilegeEscalation: true

          image: ctrox/csi-s3:v1.2.0-rc.1

          imagePullPolicy: Never

          imagePullPolicy: "Always"

          args:

            - "--endpoint=$(CSI_ENDPOINT)"

            - "--nodeid=$(NODE_ID)"
@@ -94,7 +94,6 @@ spec: 
              valueFrom:

                fieldRef:

                  fieldPath: spec.nodeName

          imagePullPolicy: "Always"

          volumeMounts:

            - name: plugin-dir

              mountPath: /csi

deploy/kubernetes/provisioner.yaml

+0 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ metadata: 
  name: csi-provisioner-s3

  namespace: kube-system

spec:

  selector:

    matchLabels:

      app: "csi-provisioner-s3"

  serviceName: "csi-provisioner-s3"

  replicas: 1

  selector: