github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubelet: Fixes plugin Watcher for Windows

Browse Source 
Currently, the plugin Watcher checks if a file is a socket or not by
running mode&os.ModeSocket != 0, which can't be True on Windows.

util.IsUnixDomainSocket should be used instead.
This commit is contained in:
Claudiu Belu 2022-07-26 17:47:58 +03:00
parent bc974c8ab9
commit f567b85cc4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher.go
View File

@ -131,12 +131,12 @@ func (w *Watcher) traversePluginDir(dir string) error {
return nil return nil
} }
switch mode := info.Mode(); { mode := info.Mode()
case mode.IsDir(): if mode.IsDir() {
if err := w.fsWatcher.Add(path); err != nil { if err := w.fsWatcher.Add(path); err != nil {
return fmt.Errorf("failed to watch %s, err: %v", path, err) return fmt.Errorf("failed to watch %s, err: %v", path, err)
} }
case mode&os.ModeSocket != 0: } else if isSocket, _ := util.IsUnixDomainSocket(path); isSocket {
event := fsnotify.Event{ event := fsnotify.Event{
Name: path, Name: path,
Op: fsnotify.Create, Op: fsnotify.Create,
@ -145,7 +145,7 @@ func (w *Watcher) traversePluginDir(dir string) error {
if err := w.handleCreateEvent(event); err != nil { if err := w.handleCreateEvent(event); err != nil {
klog.ErrorS(err, "Error when handling create", "event", event) klog.ErrorS(err, "Error when handling create", "event", event)
} }
default: } else {
klog.V(5).InfoS("Ignoring file", "path", path, "mode", mode) klog.V(5).InfoS("Ignoring file", "path", path, "mode", mode)
} }