Merge pull request #1527 from iltyty/fix-nas-mounter

Fix incorrect nas mounter issue

Author: k8s-ci-robot

pkg/nas/csi_agent.go

@@ -16,6 +16,7 @@ type CSIAgent struct {
 
 func NewCSIAgent(socketPath string) *CSIAgent {
 	config := &internal.NodeConfig{
+		AgentMode:        true,
 		EnablePortCheck:  true,
 		MountProxySocket: socketPath,
 		CNFSGetter:       unsupportedCNFSGetter{},

pkg/nas/internal/config.go

@@ -86,6 +86,7 @@ type NodeConfig struct {
 
 	// path of mount proxy socket
 	MountProxySocket string
+	AgentMode        bool
 
 	// clients for kubernetes
 	KubeClient kubernetes.Interface

pkg/nas/mounter.go

@@ -32,12 +32,16 @@ func (m *NasMounter) Mount(source string, target string, fstype string, options
 	return err
 }
 
-func newNasMounter() mountutils.Interface {
+func newNasMounter(agentMode bool) mountutils.Interface {
 	inner := mountutils.NewWithoutSystemd("")
-	return &NasMounter{
+	m := &NasMounter{
 		Interface:     inner,
 		alinasMounter: inner,
 	}
+	if !agentMode {
+		m.alinasMounter = mounter.NewConnectorMounter(inner, "")
+	}
+	return m
 }
 
 func newNasMounterWithProxy(socketPath string) mountutils.Interface {

pkg/nas/mounter_test.go

@@ -25,7 +25,7 @@ func (m *errorMockMounter) Mount(source string, target string, fstype string, op
 }
 
 func TestNewNasMounter(t *testing.T) {
-	actual := newNasMounter()
+	actual := newNasMounter(true)
 	assert.NotNil(t, actual)
 }
 

pkg/nas/nodeserver.go

@@ -70,7 +70,7 @@ func newNodeServer(config *internal.NodeConfig) *nodeServer {
 		},
 	}
 	if config.MountProxySocket == "" {
-		ns.mounter = newNasMounter()
+		ns.mounter = newNasMounter(ns.config.AgentMode)
 	} else {
 		ns.recorder = utils.NewEventRecorder()
 		ns.mounter = newNasMounterWithProxy(config.MountProxySocket)