mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-14 10:20:20 +00:00
cephfs: refactoring for CSI 0.2.0 part 1
This commit is contained in:
parent
06f411bbf3
commit
66c16e35e6
2
.gitignore
vendored
2
.gitignore
vendored
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
# docker build
|
# docker build
|
||||||
/deploy/rbd/docker/rbdplugin
|
/deploy/rbd/docker/rbdplugin
|
||||||
/deploy/cephfs/docker/rbdplugin
|
/deploy/cephfs/docker/cephfsplugin
|
||||||
|
|
||||||
# Emacs save files
|
# Emacs save files
|
||||||
*~
|
*~
|
||||||
|
@ -21,7 +21,8 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
"github.com/ceph/ceph-csi/pkg/cephfs"
|
// "github.com/ceph/ceph-csi/pkg/cephfs"
|
||||||
|
"github.com/gman0/ceph-csi/pkg/cephfs"
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ spec:
|
|||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
containers:
|
containers:
|
||||||
- name: driver-registrar
|
- name: driver-registrar
|
||||||
image: quay.io/k8scsi/driver-registrar:latest
|
image: quay.io/k8scsi/driver-registrar:v0.2.0
|
||||||
args:
|
args:
|
||||||
- "--v=5"
|
- "--v=5"
|
||||||
- "--csi-address=$(ADDRESS)"
|
- "--csi-address=$(ADDRESS)"
|
||||||
|
@ -66,7 +66,7 @@ spec:
|
|||||||
serviceAccount: csi-attacher
|
serviceAccount: csi-attacher
|
||||||
containers:
|
containers:
|
||||||
- name: csi-attacher
|
- name: csi-attacher
|
||||||
image: quay.io/k8scsi/csi-attacher:latest
|
image: quay.io/k8scsi/csi-attacher:v0.2.0
|
||||||
args:
|
args:
|
||||||
- "--v=5"
|
- "--v=5"
|
||||||
- "--csi-address=$(ADDRESS)"
|
- "--csi-address=$(ADDRESS)"
|
||||||
|
@ -75,7 +75,7 @@ spec:
|
|||||||
serviceAccount: csi-provisioner
|
serviceAccount: csi-provisioner
|
||||||
containers:
|
containers:
|
||||||
- name: csi-provisioner
|
- name: csi-provisioner
|
||||||
image: quay.io/k8scsi/csi-provisioner:latest
|
image: quay.io/k8scsi/csi-provisioner:v0.2.0
|
||||||
args:
|
args:
|
||||||
- "--provisioner=cephfsplugin"
|
- "--provisioner=cephfsplugin"
|
||||||
- "--csi-address=$(ADDRESS)"
|
- "--csi-address=$(ADDRESS)"
|
||||||
|
@ -41,7 +41,7 @@ type cephfsDriver struct {
|
|||||||
var (
|
var (
|
||||||
driver *cephfsDriver
|
driver *cephfsDriver
|
||||||
version = csi.Version{
|
version = csi.Version{
|
||||||
Minor: 1,
|
Minor: 2,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -75,9 +75,9 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
|
|||||||
glog.V(4).Infof("cephfs: volume created at %s", vol.Root)
|
glog.V(4).Infof("cephfs: volume created at %s", vol.Root)
|
||||||
|
|
||||||
return &csi.CreateVolumeResponse{
|
return &csi.CreateVolumeResponse{
|
||||||
VolumeInfo: &csi.VolumeInfo{
|
Volume: &csi.Volume{
|
||||||
Id: volId.id,
|
Id: volId.id,
|
||||||
CapacityBytes: uint64(volSz),
|
CapacityBytes: volSz,
|
||||||
Attributes: vol.makeMap(),
|
Attributes: vol.makeMap(),
|
||||||
},
|
},
|
||||||
}, nil
|
}, nil
|
||||||
|
Loading…
Reference in New Issue
Block a user