Skip to content

Commit 84109f4

Browse files
committed
fixed conflict resolution oversight
1 parent 1531ae6 commit 84109f4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmd/plugin/node_server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const (
3030

3131
type ImagePullStatus int
3232

33-
func NewNodeServer(driver *csicommon.CSIDriver, mounter *backend.SnapshotMounter, imageSvc cri.ImageServiceClient, secretStore secret.Store, asyncImagePullTimeout time.Duration) *NodeServer {
33+
func NewNodeServer(driver *csicommon.CSIDriver, mounter backend.Mounter, imageSvc cri.ImageServiceClient, secretStore secret.Store, asyncImagePullTimeout time.Duration) *NodeServer {
3434
ns := NodeServer{
3535
DefaultNodeServer: csicommon.NewDefaultNodeServer(driver),
3636
mounter: mounter,
@@ -51,7 +51,7 @@ func NewNodeServer(driver *csicommon.CSIDriver, mounter *backend.SnapshotMounter
5151

5252
type NodeServer struct {
5353
*csicommon.DefaultNodeServer
54-
mounter *backend.SnapshotMounter
54+
mounter backend.Mounter
5555
imageSvc cri.ImageServiceClient
5656
secretStore secret.Store
5757
asyncImagePullTimeout time.Duration

0 commit comments

Comments
 (0)