Skip to content

Commit

Permalink
Merge pull request #408 from fredkan/v1.1.1-local-nodeserver-update
Browse files Browse the repository at this point in the history
update local nodeserver
  • Loading branch information
fredkan committed Feb 4, 2021
2 parents 482d88c + 433b18d commit baa3f66
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions pkg/local/nodeserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,25 @@ func NewNodeServer(d *csicommon.CSIDriver, dName, nodeID string) csi.NodeServer
log.Fatalf("Error building kubernetes clientset: %s", err.Error())
}

// local volume daemon
// GRPC server to provide volume manage
go server.Start()
mounter := k8smount.New("")
serviceType := os.Getenv(utils.ServiceType)
if len(serviceType) == 0 || serviceType == "" {
serviceType = utils.PluginService
}

// pv handler
// watch pv/pvc annotations and provide volume manage
go generator.VolumeHandler()
if serviceType == utils.PluginService {
// local volume daemon
// GRPC server to provide volume manage
go server.Start()

mounter := k8smount.New("")
// maintain pmem node
if types.GlobalConfigVar.PmemEnable {
manager.MaintainPMEM(types.GlobalConfigVar.PmemType, mounter)
// pv handler
// watch pv/pvc annotations and provide volume manage
go generator.VolumeHandler()

// maintain pmem node
if types.GlobalConfigVar.PmemEnable {
manager.MaintainPMEM(types.GlobalConfigVar.PmemType, mounter)
}
}

return &nodeServer{
Expand Down

0 comments on commit baa3f66

Please sign in to comment.