Skip to content

K
k3s
Commit 956acc2b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #47643 from CaoShuFeng/golang.org/x/exp/inotify

Automatic merge from submit-queue (batch tested with PRs 46336, 47643) Fix invalid filename in kubelet log Fixes: https://github.com/kubernetes/kubernetes/issues/47641 **Release note**: ``` NONE ```
parents 786407cb 4ee6b42a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
pkg/kubelet/config/file.go
View file @ 956acc2b
...@@ -23,6 +23,7 @@ import ( ...@@ -23,6 +23,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"sort" "sort"
"strings"
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
...@@ -44,6 +45,9 @@ type sourceFile struct { ...@@ -44,6 +45,9 @@ type sourceFile struct {
} }
func NewSourceFile(path string, nodeName types.NodeName, period time.Duration, updates chan<- interface{}) { func NewSourceFile(path string, nodeName types.NodeName, period time.Duration, updates chan<- interface{}) {
// "golang.org/x/exp/inotify" requires a path without trailing "/"
path = strings.TrimRight(path, string(os.PathSeparator))
config := new(path, nodeName, period, updates) config := new(path, nodeName, period, updates)
glog.V(1).Infof("Watching path %q", path) glog.V(1).Infof("Watching path %q", path)
go wait.Forever(config.run, period) go wait.Forever(config.run, period)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment