github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor k8s core csi bits for CSI Spec 0.2.0

Browse Source
This commit is contained in:
Serguei Bezverkhi
2018-02-16 13:29:34 -05:00
parent 7365f2522e
commit ea4df51b3b
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/volume/csi/csi_client.go
View File

@@ -122,11 +122,11 @@ func (c *csiDriverClient) AssertSupportedVersion(ctx grpctx.Context, ver *csipb.
// also the minor number. If our supported version is >= 1.X.X
// then check only the major number.
for _, v := range vers {
if ver.GetMajor() == uint32(0) &&
if ver.GetMajor() == int32(0) &&
(ver.GetMajor() == v.GetMajor() && ver.GetMinor() == v.GetMinor()) {
supported = true
break
} else if ver.GetMajor() != uint32(0) && ver.GetMajor() == v.GetMajor() {
} else if ver.GetMajor() != int32(0) && ver.GetMajor() == v.GetMajor() {
supported = true
break
}
@@ -176,12 +176,12 @@ func (c *csiDriverClient) NodePublishVolume(
}
req := &csipb.NodePublishVolumeRequest{
Version: csiVersion,
VolumeId: volID,
TargetPath: targetPath,
Readonly: readOnly,
PublishVolumeInfo: volumeInfo,
VolumeAttributes: volumeAttribs,
Version: csiVersion,
VolumeId: volID,
TargetPath: targetPath,
Readonly: readOnly,
PublishInfo: volumeInfo,
VolumeAttributes: volumeAttribs,
VolumeCapability: &csipb.VolumeCapability{
AccessMode: &csipb.VolumeCapability_AccessMode{