Skip to content

Commit

Permalink
Upgraded CSI spec to v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jqmichael committed Jun 1, 2020
1 parent 6e73fac commit c2f4cb1
Show file tree
Hide file tree
Showing 7 changed files with 159 additions and 26 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ FROM golang:1.13.4-stretch as builder
WORKDIR /go/src/github.com/kubernetes-sigs/aws-efs-csi-driver

# Cache go modules
ENV GOPROXY=direct
COPY go.mod .
COPY go.sum .
RUN go mod download
Expand Down
3 changes: 0 additions & 3 deletions deploy/kubernetes/base/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ spec:
securityContext:
privileged: true
image: amazon/aws-efs-csi-driver:latest
imagePullPolicy: Always
args:
- --endpoint=$(CSI_ENDPOINT)
- --logtostderr
Expand Down Expand Up @@ -55,7 +54,6 @@ spec:
failureThreshold: 5
- name: csi-driver-registrar
image: quay.io/k8scsi/csi-node-driver-registrar:v1.3.0
imagePullPolicy: Always
args:
- --csi-address=$(ADDRESS)
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
Expand All @@ -75,7 +73,6 @@ spec:
- name: registration-dir
mountPath: /registration
- name: liveness-probe
imagePullPolicy: Always
image: quay.io/k8scsi/livenessprobe:v2.0.0
args:
- --csi-address=/csi/csi.sock
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/overlays/stable/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ images:
- name: amazon/aws-efs-csi-driver
newTag: v0.3.0
- name: quay.io/k8scsi/livenessprobe
newTag: v1.1.0
newTag: v2.0.0
- name: quay.io/k8scsi/csi-node-driver-registrar
newTag: v1.1.0
newTag: v1.3.0

14 changes: 7 additions & 7 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

The [Amazon Elastic File System](https://aws.amazon.com/efs/) Container Storage Interface (CSI) Driver implements the [CSI](https://github.com/container-storage-interface/spec/blob/master/spec.md) specification for container orchestrators to manage the lifecycle of Amazon EFS filesystems.

### CSI Specification Compability Matrix
| AWS EFS CSI Driver \ CSI Version | v0.3.0| v1.1.0 |
|----------------------------------------|-------|--------|
| master branch | no | yes |
| v0.3.0 | no | yes |
| v0.2.0 | no | yes |
| v0.1.0 | yes | no |
### CSI Specification Compatibility Matrix
| AWS EFS CSI Driver \ CSI Spec Version | v0.3.0| v1.1.0 | v1.2.0 |
|----------------------------------------|-------|--------|--------|
| master branch | no | no | yes |
| v0.3.0 | no | yes | no |
| v0.2.0 | no | yes | no |
| v0.1.0 | yes | no | no |

## Features
Currently only static provisioning is supported. This means an AWS EFS filesystem needs to be created manually on AWS first. After that it can be mounted inside a container as a volume using the driver.
Expand Down
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module github.com/kubernetes-sigs/aws-efs-csi-driver

require (
github.com/aws/aws-sdk-go v1.30.10
github.com/container-storage-interface/spec v1.1.0
github.com/golang/mock v1.3.1
github.com/kubernetes-csi/csi-test v2.0.2-0.20190719174114-bc42f92ebdc8+incompatible
github.com/onsi/ginkgo v1.8.0
github.com/onsi/gomega v1.5.0
google.golang.org/grpc v1.23.0
github.com/aws/aws-sdk-go v1.31.2
github.com/container-storage-interface/spec v1.2.0
github.com/golang/mock v1.4.3
github.com/kubernetes-csi/csi-test v2.2.0+incompatible
github.com/onsi/ginkgo v1.12.2
github.com/onsi/gomega v1.10.1
google.golang.org/grpc v1.26.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/klog v0.4.0
Expand Down
147 changes: 140 additions & 7 deletions go.sum

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/driver/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
os.Remove(target)
return nil, status.Errorf(codes.Internal, "Could not mount %q at %q: %v", source, target, err)
}
klog.V(5).Infof("NodePublishVolume: %s was mounted", target)

return &csi.NodePublishVolumeResponse{}, nil
}
Expand Down Expand Up @@ -160,6 +161,7 @@ func (d *Driver) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublish
if err != nil {
return nil, status.Errorf(codes.Internal, "Could not unmount %q: %v", target, err)
}
klog.V(5).Infof("NodeUnpublishVolume: %s unmounted", target)

return &csi.NodeUnpublishVolumeResponse{}, nil
}
Expand Down

0 comments on commit c2f4cb1

Please sign in to comment.