remove ControllerPublishSupported and NodeStageSupported from Resources type

Author: arbelnat

pkg/sanity/node.go

@@ -310,11 +310,9 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
 		nodeExpansionSupported = isNodeCapabilitySupported(n, csi.NodeServiceCapability_RPC_EXPAND_VOLUME)
 		controllerExpansionSupported = isControllerCapabilitySupported(cl, csi.ControllerServiceCapability_RPC_EXPAND_VOLUME)
 		r = &Resources{
-			Context:                    sc,
-			ControllerClient:           cl,
-			NodeClient:                 n,
-			ControllerPublishSupported: controllerPublishSupported,
-			NodeStageSupported:         nodeStageSupported,
+			Context:          sc,
+			ControllerClient: cl,
+			NodeClient:       n,
 		}
 	})
 

pkg/sanity/resources.go

@@ -65,8 +65,6 @@ type Resources struct {
 	// directly if automatic cleanup is not desired and cannot be avoided
 	// otherwise.
 	csi.NodeClient
-	ControllerPublishSupported bool
-	NodeStageSupported         bool
 
 	// mutex protects access to managedResourceInfos.
 	mutex                sync.Mutex
@@ -279,7 +277,7 @@ func (cl *Resources) cleanupVolume(ctx context.Context, offset int, volumeID str
 			errs = append(errs, fmt.Errorf("NodeUnpublishVolume for volume ID %s failed: %s", volumeID, err))
 		}
 
-		if cl.NodeStageSupported {
+		if isNodeCapabilitySupported(cl, csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME) {
 			if _, err := cl.NodeUnstageVolume(
 				ctx,
 				&csi.NodeUnstageVolumeRequest{
@@ -292,7 +290,7 @@ func (cl *Resources) cleanupVolume(ctx context.Context, offset int, volumeID str
 		}
 	}
 
-	if cl.ControllerPublishSupported && info.NodeID != "" {
+	if info.NodeID != "" {
 		if _, err := cl.ControllerClient.ControllerUnpublishVolume(
 			ctx,
 			&csi.ControllerUnpublishVolumeRequest{