github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@ -381,6 +381,7 @@ pkg/volume/azure_dd
pkg/volume/azure_file pkg/volume/azure_file
pkg/volume/cephfs pkg/volume/cephfs
pkg/volume/configmap pkg/volume/configmap
pkg/volume/csi/fake
pkg/volume/empty_dir pkg/volume/empty_dir
pkg/volume/fc pkg/volume/fc
pkg/volume/flexvolume pkg/volume/flexvolume

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

4
pkg/volume/csi/fake/fake_client.go
View File

@ -136,8 +136,8 @@ func (f *NodeClient) NodeUnpublishVolume(ctx context.Context, req *csipb.NodeUnp
return &csipb.NodeUnpublishVolumeResponse{}, nil return &csipb.NodeUnpublishVolumeResponse{}, nil
} }
// GetNodeID implements method // NodeGetId implements method
func (f *NodeClient) GetNodeID(ctx context.Context, in *csipb.GetNodeIDRequest, opts ...grpc.CallOption) (*csipb.GetNodeIDResponse, error) { func (f *NodeClient) NodeGetId(ctx context.Context, in *csipb.NodeGetIdRequest, opts ...grpc.CallOption) (*csipb.NodeGetIdResponse, error) {
return nil, nil return nil, nil
} }

2
test/e2e/storage/csi_hostpath.go
View File

@ -28,7 +28,7 @@ import (
) )
const ( const (
csiHostPathPluginImage string = "docker.io/k8scsi/hostpathplugin:0.1" csiHostPathPluginImage string = "quay.io/k8scsi/hostpathplugin:v0.2.0"
) )
func csiHostPathPod( func csiHostPathPod(

6
test/e2e/storage/csi_volumes.go
View File

@ -34,9 +34,9 @@ import (
) )
const ( const (
csiExternalAttacherImage string = "docker.io/k8scsi/csi-attacher:0.1" csiExternalAttacherImage string = "quay.io/k8scsi/csi-attacher:v0.2.0"
csiExternalProvisionerImage string = "docker.io/k8scsi/csi-provisioner:0.1" csiExternalProvisionerImage string = "quay.io/k8scsi/csi-provisioner:v0.2.0"
csiDriverRegistrarImage string = "docker.io/k8scsi/driver-registrar" csiDriverRegistrarImage string = "quay.io/k8scsi/driver-registrar:v0.2.0"
) )
func externalAttacherServiceAccount( func externalAttacherServiceAccount(