Merge pull request #15 from msau42/more-access-modes

Add more access modes to volume capabilities
This commit is contained in:
Kubernetes Prow Robot 2020-03-27 03:40:23 -07:00 committed by GitHub
commit 2bb0d1ead5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,7 +31,7 @@ type nfsDriver struct {
//ids *identityServer //ids *identityServer
ns *nodeServer ns *nodeServer
cap []*csi.VolumeCapability_AccessMode cap map[csi.VolumeCapability_AccessMode_Mode]bool
cscap []*csi.ControllerServiceCapability cscap []*csi.ControllerServiceCapability
} }
@ -51,9 +51,18 @@ func NewNFSdriver(nodeID, endpoint string) *nfsDriver {
version: version, version: version,
nodeID: nodeID, nodeID: nodeID,
endpoint: endpoint, endpoint: endpoint,
cap: map[csi.VolumeCapability_AccessMode_Mode]bool{},
} }
n.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER}) vcam := []csi.VolumeCapability_AccessMode_Mode{
csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY,
csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY,
csi.VolumeCapability_AccessMode_MULTI_NODE_SINGLE_WRITER,
csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER,
}
n.AddVolumeCapabilityAccessModes(vcam)
// NFS plugin does not support ControllerServiceCapability now. // NFS plugin does not support ControllerServiceCapability now.
// If support is added, it should set to appropriate // If support is added, it should set to appropriate
// ControllerServiceCapability RPC types. // ControllerServiceCapability RPC types.
@ -86,8 +95,8 @@ func (n *nfsDriver) AddVolumeCapabilityAccessModes(vc []csi.VolumeCapability_Acc
for _, c := range vc { for _, c := range vc {
glog.Infof("Enabling volume access mode: %v", c.String()) glog.Infof("Enabling volume access mode: %v", c.String())
vca = append(vca, &csi.VolumeCapability_AccessMode{Mode: c}) vca = append(vca, &csi.VolumeCapability_AccessMode{Mode: c})
n.cap[c] = true
} }
n.cap = vca
return vca return vca
} }