add plugin mode

Signed-off-by: xuchenCN <[email protected]>

Author: xuchenCN

cmd/k8s-rdma-shared-dp/main.go

@@ -68,6 +68,9 @@ func main() {
 	useCdi := false
 	flag.BoolVar(&useCdi, "use-cdi", false,
 		"Use Container Device Interface to expose devices in containers")
+	kubeletPluginMode := false
+	flag.BoolVar(&kubeletPluginMode, "kubelet-plugin-mode", true,
+		"Using Kubelet Plugin Registry Mode if true, else to using Deprecated Device Plugin Registry Path ")
 	flag.Parse()
 	if versionOpt {
 		fmt.Printf("%s\n", printVersionString())
@@ -80,7 +83,7 @@ func main() {
 
 	log.Println("Starting K8s RDMA Shared Device Plugin version=", version)
 
-	rm := resources.NewResourceManager(configFilePath, useCdi)
+	rm := resources.NewResourceManager(configFilePath, useCdi, kubeletPluginMode)
 
 	log.Println("resource manager reading configs")
 	if err := rm.ReadConfig(); err != nil {

pkg/resources/resources_manager.go

@@ -90,18 +90,17 @@ type resourceManager struct {
 	useCdi                 bool
 }
 
-func NewResourceManager(configFile string, useCdi bool) types.ResourceManager {
-	watcherMode := detectPluginWatchMode(activeSockDir)
-	if watcherMode {
+func NewResourceManager(configFile string, useCdi, kubeletPluginMode bool) types.ResourceManager {
+	if kubeletPluginMode {
 		fmt.Println("Using Kubelet Plugin Registry Mode")
 	} else {
-		fmt.Println("Using Deprecated Devie Plugin Registry Path")
+		fmt.Println("Using Deprecated Device Plugin Registry Path")
 	}
 	return &resourceManager{
 		configFile:            configFile,
 		defaultResourcePrefix: rdmaHcaResourcePrefix,
 		socketSuffix:          socketSuffix,
-		watchMode:             watcherMode,
+		watchMode:             kubeletPluginMode,
 		netlinkManager:        &netlinkManager{},
 		rds:                   NewRdmaDeviceSpec(requiredRdmaDevices),
 		useCdi:                useCdi,

pkg/resources/resources_manager_test.go

@@ -80,7 +80,7 @@ var _ = Describe("ResourcesManger", func() {
 				activeSockDir = activeSockDirBackUP
 			}()
 
-			obj := NewResourceManager(DefaultConfigFilePath, false)
+			obj := NewResourceManager(DefaultConfigFilePath, false, true)
 			rm := obj.(*resourceManager)
 			Expect(rm.watchMode).To(Equal(true))
 		})
@@ -92,7 +92,7 @@ var _ = Describe("ResourcesManger", func() {
 				activeSockDir = activeSockDirBackUP
 			}()
 
-			obj := NewResourceManager(DefaultConfigFilePath, false)
+			obj := NewResourceManager(DefaultConfigFilePath, false, true)
 			rm := obj.(*resourceManager)
 			Expect(rm.watchMode).To(Equal(false))
 		})