Merge pull request #355 from kubernetes-sigs/remove-instanceid-check

fix: remove InstanceID check in ControllerPublishVolume

Author: andyzhangx

pkg/azurefile/controllerserver.go

@@ -31,9 +31,7 @@ import (
 	"github.com/pborman/uuid"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
-	cloudprovider "k8s.io/cloud-provider"
 	"k8s.io/klog/v2"
 	"k8s.io/legacy-cloud-providers/azure"
 	"k8s.io/legacy-cloud-providers/azure/clients/fileclient"
@@ -343,13 +341,6 @@ func (d *Driver) ControllerPublishVolume(ctx context.Context, req *csi.Controlle
 	if len(nodeID) == 0 {
 		return nil, status.Error(codes.InvalidArgument, "Node ID not provided")
 	}
-	nodeName := types.NodeName(nodeID)
-	if _, err := d.cloud.InstanceID(ctx, nodeName); err != nil {
-		if err == cloudprovider.InstanceNotFound {
-			return nil, status.Error(codes.NotFound, fmt.Sprintf("failed to get azure instance id for node %q (%v)", nodeName, err))
-		}
-		return nil, status.Error(codes.Internal, fmt.Sprintf("get azure instance id for node %q failed with %v", nodeName, err))
-	}
 
 	_, accountName, accountKey, fileShareName, diskName, err := d.GetAccountInfo(volumeID, req.GetSecrets(), req.GetVolumeContext())
 	// always check diskName first since if it's not vhd disk attach, ControllerPublishVolume is not necessary

pkg/azurefile/controllerserver_test.go

@@ -1010,24 +1010,6 @@ func TestControllerPublishVolume(t *testing.T) {
 			},
 			expectedErr: status.Error(codes.InvalidArgument, "Node ID not provided"),
 		},
-		{
-			desc: "Instance not found",
-			req: &csi.ControllerPublishVolumeRequest{
-				VolumeId:         "vol_1",
-				VolumeCapability: &stdVolCap,
-				NodeId:           "vm1",
-			},
-			expectedErr: status.Error(codes.NotFound, "failed to get azure instance id for node \"vm1\" (instance not found)"),
-		},
-		{
-			desc: "Get azure instance returns error",
-			req: &csi.ControllerPublishVolumeRequest{
-				VolumeId:         "vol_1",
-				VolumeCapability: &stdVolCap,
-				NodeId:           "vm2",
-			},
-			expectedErr: status.Error(codes.Internal, "get azure instance id for node \"vm2\" failed with Retriable: false, RetryAfter: 0s, HTTPStatusCode: 502, RawError: instance not found"),
-		},
 		{
 			desc: "Valid request disk name empty",
 			req: &csi.ControllerPublishVolumeRequest{

test/sanity/run-test.sh

@@ -35,12 +35,12 @@ _output/azurefileplugin --endpoint "$endpoint" --nodeid "$nodeid" -v=5 &
 
 echo 'Begin to run sanity test...'
 readonly CSI_SANITY_BIN='csi-test/cmd/csi-sanity/csi-sanity'
-"$CSI_SANITY_BIN" --ginkgo.v --ginkgo.noColor --csi.endpoint="$endpoint" --ginkgo.skip='should fail when the volume source snapshot is not found|should work'
+"$CSI_SANITY_BIN" --ginkgo.v --ginkgo.noColor --csi.endpoint="$endpoint" --ginkgo.skip='should fail when the volume source snapshot is not found|should work|should fail when the volume does not exist|should fail when the node does not exist'
 
 testvolumeparameters='/tmp/vhd.yaml'
 cat > $testvolumeparameters << EOF
 fstype: ext4
 EOF
 
 echo 'Begin to run sanity test for vhd disk feature...'
-"$CSI_SANITY_BIN" --ginkgo.v --ginkgo.noColor --csi.endpoint="$endpoint" --csi.testvolumeparameters="$testvolumeparameters" --ginkgo.skip='should fail when the volume source snapshot is not found|should work|should fail when volume does not exist on the specified path'
+"$CSI_SANITY_BIN" --ginkgo.v --ginkgo.noColor --csi.endpoint="$endpoint" --csi.testvolumeparameters="$testvolumeparameters" --ginkgo.skip='should fail when the volume source snapshot is not found|should work|should fail when volume does not exist on the specified path|should fail when the volume does not exist|should fail when the node does not exist'