From b299be82e33af25ca51859cec6968f60ede6c45b Mon Sep 17 00:00:00 2001 From: jharrod Date: Tue, 4 Feb 2025 08:48:17 -0700 Subject: [PATCH] revert change to tracking file dir --- frontend/csi/node_helpers/kubernetes/plugin.go | 2 +- frontend/csi/node_helpers/plain/plugin.go | 2 +- frontend/csi/volume_publish_manager.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/csi/node_helpers/kubernetes/plugin.go b/frontend/csi/node_helpers/kubernetes/plugin.go index 2bfc9d5f1..ebc98860d 100644 --- a/frontend/csi/node_helpers/kubernetes/plugin.go +++ b/frontend/csi/node_helpers/kubernetes/plugin.go @@ -53,7 +53,7 @@ func NewHelper(orchestrator core.Orchestrator, kubeConfigPath string, enableForc return nil, fmt.Errorf("could not initialize mount client; %v", err) } - publishManager, err := csi.NewVolumePublishManager() + publishManager, err := csi.NewVolumePublishManager(config.VolumeTrackingInfoPath) if err != nil { return nil, fmt.Errorf("could not initialize VolumePublishManager; %v", err) } diff --git a/frontend/csi/node_helpers/plain/plugin.go b/frontend/csi/node_helpers/plain/plugin.go index 13ed478f3..88e23e9ea 100644 --- a/frontend/csi/node_helpers/plain/plugin.go +++ b/frontend/csi/node_helpers/plain/plugin.go @@ -25,7 +25,7 @@ func NewHelper(orchestrator core.Orchestrator) (frontend.Plugin, error) { Logc(ctx).Info("Initializing plain CSI helper frontend.") - publishManager, err := csi.NewVolumePublishManager() + publishManager, err := csi.NewVolumePublishManager("") if err != nil { return nil, fmt.Errorf("could not initialize VolumePublishManager; %v", err) } diff --git a/frontend/csi/volume_publish_manager.go b/frontend/csi/volume_publish_manager.go index a121aa8d2..6e24d7fe1 100644 --- a/frontend/csi/volume_publish_manager.go +++ b/frontend/csi/volume_publish_manager.go @@ -40,8 +40,8 @@ type VolumePublishManager struct { osFs afero.Fs } -func NewVolumePublishManager() (*VolumePublishManager, error) { - infoPath := config.VolumeTrackingInfoPath +func NewVolumePublishManager(volumeTrackingInfoPath string) (*VolumePublishManager, error) { + infoPath := volumeTrackingInfoPath mountClient, err := mount.New() if err != nil { return nil, err