Skip to content

Commit 39676d7

Browse files
committed
modify variable name
1 parent 3a37563 commit 39676d7

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ func main() {
6868
useCdi := false
6969
flag.BoolVar(&useCdi, "use-cdi", false,
7070
"Use Container Device Interface to expose devices in containers")
71-
pluginMode := false
72-
flag.BoolVar(&pluginMode, "plugin-mode", true,
71+
kubeletPluginMode := false
72+
flag.BoolVar(&kubeletPluginMode, "kubelet-plugin-mode", true,
7373
"Using Kubelet Plugin Registry Mode if true, else to using Deprecated Device Plugin Registry Path ")
7474
flag.Parse()
7575
if versionOpt {
@@ -83,7 +83,7 @@ func main() {
8383

8484
log.Println("Starting K8s RDMA Shared Device Plugin version=", version)
8585

86-
rm := resources.NewResourceManagerWithPluginMode(configFilePath, useCdi, pluginMode)
86+
rm := resources.NewResourceManager(configFilePath, useCdi, kubeletPluginMode)
8787

8888
log.Println("resource manager reading configs")
8989
if err := rm.ReadConfig(); err != nil {

pkg/resources/resources_manager.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,8 @@ type resourceManager struct {
9090
useCdi bool
9191
}
9292

93-
func NewResourceManager(configFile string, useCdi bool) types.ResourceManager {
94-
return NewResourceManagerWithPluginMode(configFile, useCdi, detectPluginWatchMode(activeSockDir))
95-
}
96-
97-
func NewResourceManagerWithPluginMode(configFile string, useCdi, pluginMode bool) types.ResourceManager {
98-
if pluginMode {
93+
func NewResourceManager(configFile string, useCdi, kubeletPluginMode bool) types.ResourceManager {
94+
if kubeletPluginMode {
9995
fmt.Println("Using Kubelet Plugin Registry Mode")
10096
} else {
10197
fmt.Println("Using Deprecated Device Plugin Registry Path")
@@ -104,7 +100,7 @@ func NewResourceManagerWithPluginMode(configFile string, useCdi, pluginMode bool
104100
configFile: configFile,
105101
defaultResourcePrefix: rdmaHcaResourcePrefix,
106102
socketSuffix: socketSuffix,
107-
watchMode: pluginMode,
103+
watchMode: kubeletPluginMode,
108104
netlinkManager: &netlinkManager{},
109105
rds: NewRdmaDeviceSpec(requiredRdmaDevices),
110106
useCdi: useCdi,

0 commit comments

Comments
 (0)