csi: Add grpc.CallOption support to NodePublishVolume

This commit is contained in:
Danielle Lancashire
2020-01-31 14:45:05 +01:00
committed by Tim Gross
parent f370e25843
commit 829eeef0bd
3 changed files with 4 additions and 4 deletions

View File

@@ -356,7 +356,7 @@ func (c *client) NodeUnstageVolume(ctx context.Context, volumeID string, staging
return err
}
func (c *client) NodePublishVolume(ctx context.Context, req *NodePublishVolumeRequest) error {
func (c *client) NodePublishVolume(ctx context.Context, req *NodePublishVolumeRequest, opts ...grpc.CallOption) error {
if c == nil {
return fmt.Errorf("Client not initialized")
}
@@ -370,7 +370,7 @@ func (c *client) NodePublishVolume(ctx context.Context, req *NodePublishVolumeRe
// NodePublishVolume's response contains no extra data. If err == nil, we were
// successful.
_, err := c.nodeClient.NodePublishVolume(ctx, req.ToCSIRepresentation())
_, err := c.nodeClient.NodePublishVolume(ctx, req.ToCSIRepresentation(), opts...)
return err
}

View File

@@ -185,7 +185,7 @@ func (c *Client) NodeUnstageVolume(ctx context.Context, volumeID string, staging
return c.NextNodeUnstageVolumeErr
}
func (c *Client) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) error {
func (c *Client) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest, opts ...grpc.CallOption) error {
c.Mu.Lock()
defer c.Mu.Unlock()

View File

@@ -58,7 +58,7 @@ type CSIPlugin interface {
// NodePublishVolume is used to prepare a volume for use by an allocation.
// if err == nil the response should be assumed to be successful.
NodePublishVolume(ctx context.Context, req *NodePublishVolumeRequest) error
NodePublishVolume(ctx context.Context, req *NodePublishVolumeRequest, opts ...grpc.CallOption) error
// NodeUnpublishVolume is used to cleanup usage of a volume for an alloc. This
// MUST be called before calling NodeUnstageVolume or ControllerUnpublishVolume