Skip to content

Add plugin mode argument to decide which folder to place the socket file #201

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 plugin mode argument to decide which folder to place the socket file #201

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
5 changes: 4 additions & 1 deletion cmd/k8s-rdma-shared-dp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions pkg/resources/resources_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions pkg/resources/resources_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
})
Expand All @@ -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))
})
Expand Down