Skip to content

feat: Add option to specify custom kubelet socket path #221

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

feat: Add option to specify custom kubelet socket path #221

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
12 changes: 10 additions & 2 deletions pkg/resources/resources_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ import (
"github.com/Mellanox/k8s-rdma-shared-dev-plugin/pkg/utils"
)

// getSocketDir returns the socket directory path, checking environment variable first
func getSocketDir(defaultPath string) string {
if envPath := os.Getenv("DP_SOCK_PATH"); envPath != "" {
return envPath
}
return defaultPath
}

const (
// General constants
DefaultConfigFilePath = "/k8s-rdma-shared-dev-plugin/config.json"
Expand All @@ -71,8 +79,8 @@ const (
)

var (
activeSockDir = "/var/lib/kubelet/plugins_registry"
deprecatedSockDir = "/var/lib/kubelet/device-plugins"
activeSockDir = getSocketDir("/var/lib/kubelet/plugins_registry")
deprecatedSockDir = getSocketDir("/var/lib/kubelet/device-plugins")
)

// resourceManager for plugin
Expand Down
25 changes: 25 additions & 0 deletions pkg/resources/resources_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,31 @@ var _ = Describe("ResourcesManger", func() {
Expect(rm.watchMode).To(Equal(false))
})
})
Context("getSocketDir", func() {
It("returns environment variable when DP_SOCK_PATH is set", func() {
customPath := "/custom/socket/path"
os.Setenv("DP_SOCK_PATH", customPath)
defer os.Unsetenv("DP_SOCK_PATH")

result := getSocketDir("/default/path")
Expect(result).To(Equal(customPath))
})
It("returns default path when DP_SOCK_PATH is not set", func() {
os.Unsetenv("DP_SOCK_PATH")
defaultPath := "/default/path"

result := getSocketDir(defaultPath)
Expect(result).To(Equal(defaultPath))
})
It("returns environment variable even when it's empty string", func() {
os.Setenv("DP_SOCK_PATH", "")
defer os.Unsetenv("DP_SOCK_PATH")
defaultPath := "/default/path"

result := getSocketDir(defaultPath)
Expect(result).To(Equal(defaultPath))
})
})
//nolint:dupl
Context("ReadConfig", func() {
It("Read valid config file with non default periodic update", func() {
Expand Down