Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/k8s-rdma-shared-dp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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 {
Expand Down
8 changes: 7 additions & 1 deletion pkg/resources/resources_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"fmt"
"log"
"os"
"path"
"regexp"
"strconv"
"time"
Expand Down Expand Up @@ -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")
Expand Down
7 changes: 4 additions & 3 deletions pkg/resources/resources_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
})
Expand All @@ -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))
})
Expand Down