Unverified Commit 220bdf26 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #59209 from sbezverk/csi_0.2.0_breaking_changes

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. CSI 0.2.0 breaking changes Refactor kubernetes CSI bits to support CSI version 0.2.0 ```release-note Addressing breaking changes introduced by new 0.2.0 release of CSI spec ```
parents 6d0b7174 ea4df51b
...@@ -442,8 +442,8 @@ ...@@ -442,8 +442,8 @@
}, },
{ {
"ImportPath": "github.com/container-storage-interface/spec/lib/go/csi", "ImportPath": "github.com/container-storage-interface/spec/lib/go/csi",
"Comment": "v0.1.0", "Comment": "v0.2.0",
"Rev": "9e88e4bfabeca1b8e4810555815f112159292ada" "Rev": "7ab01a90da87f9fef3ee1de0494962fdefaf7db7"
}, },
{ {
"ImportPath": "github.com/containerd/console", "ImportPath": "github.com/containerd/console",
......
...@@ -380,6 +380,7 @@ pkg/volume/azure_dd ...@@ -380,6 +380,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
......
...@@ -122,11 +122,11 @@ func (c *csiDriverClient) AssertSupportedVersion(ctx grpctx.Context, ver *csipb. ...@@ -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( ...@@ -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{
......
...@@ -136,8 +136,8 @@ func (f *NodeClient) NodeUnpublishVolume(ctx context.Context, req *csipb.NodeUnp ...@@ -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
} }
......
...@@ -28,7 +28,7 @@ import ( ...@@ -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(
......
...@@ -34,9 +34,9 @@ import ( ...@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment