Add '--kubelet-root-dir' flag to configure the root directory of kubelet

Signed-off-by: Cyclinder Kuo <[email protected]>

Author: cyclinder

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

@@ -60,12 +60,13 @@ func main() {
 
 	// add version flag
 	versionOpt := false
-	var configFilePath string
+	useCdi := false
+	var configFilePath, kubeletRootDir string
 	flag.BoolVar(&versionOpt, "version", false, "Show application version")
 	flag.BoolVar(&versionOpt, "v", false, "Show application version")
 	flag.StringVar(
 		&configFilePath, "config-file", resources.DefaultConfigFilePath, "path to device plugin config file")
-	useCdi := false
+	flag.StringVar(&kubeletRootDir, "kubelet-root-dir", "/var/lib/kubelet", "root directory of kubelet")
 	flag.BoolVar(&useCdi, "use-cdi", false,
 		"Use Container Device Interface to expose devices in containers")
 	flag.Parse()
@@ -80,7 +81,7 @@ func main() {
 
 	log.Println("Starting K8s RDMA Shared Device Plugin version=", version)
 
-	rm := resources.NewResourceManager(configFilePath, useCdi)
+	rm := resources.NewResourceManager(configFilePath, kubeletRootDir, useCdi)
 
 	log.Println("resource manager reading configs")
 	if err := rm.ReadConfig(); err != nil {

pkg/resources/resources_manager.go

@@ -39,6 +39,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"path"
 	"regexp"
 	"strconv"
 	"time"
@@ -90,7 +91,12 @@ type resourceManager struct {
 	useCdi                 bool
 }
 
-func NewResourceManager(configFile string, useCdi bool) types.ResourceManager {
+func NewResourceManager(configFile, kubeletRootDir string, useCdi bool) types.ResourceManager {
+	if kubeletRootDir != "" {
+		activeSockDir = path.Join(kubeletRootDir, "plugins_registry")
+		deprecatedSockDir = path.Join(kubeletRootDir, "device-plugins")
+	}
+
 	watcherMode := detectPluginWatchMode(activeSockDir)
 	if watcherMode {
 		fmt.Println("Using Kubelet Plugin Registry Mode")

pkg/resources/resources_manager_test.go

@@ -69,18 +69,19 @@ func (l *FakeLink) Type() string {
 var _ = Describe("ResourcesManger", func() {
 	Context("NewResourceManager", func() {
 		const activeSockDirBackUP = "/var/lib/kubelet/plugins_registry"
+		const kubeletRootDir = "/var/lib/kubelet"
 
 		It("Resource Manager with watcher mode", func() {
 			fs := utils.FakeFilesystem{
 				Dirs: []string{activeSockDir[1:]},
 			}
-			defer fs.Use()()
+			defer fs.Use()
 			activeSockDir = path.Join(fs.RootDir, activeSockDirBackUP[1:])
 			defer func() {
 				activeSockDir = activeSockDirBackUP
 			}()
 
-			obj := NewResourceManager(DefaultConfigFilePath, false)
+			obj := NewResourceManager(DefaultConfigFilePath, kubeletRootDir, false)
 			rm := obj.(*resourceManager)
 			Expect(rm.watchMode).To(Equal(true))
 		})
@@ -92,7 +93,7 @@ var _ = Describe("ResourcesManger", func() {
 				activeSockDir = activeSockDirBackUP
 			}()
 
-			obj := NewResourceManager(DefaultConfigFilePath, false)
+			obj := NewResourceManager(DefaultConfigFilePath, kubeletRootDir, false)
 			rm := obj.(*resourceManager)
 			Expect(rm.watchMode).To(Equal(false))
 		})