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

Migrate pkg/kubelet/config to structured logging

Browse Source 
Co-authored-by: Shubheksha <shubheksha@users.noreply.github.com>

Co-authored-by: Marek Siarkowicz <marek.siarkowicz@protonmail.com>

Co-authored-by: Elana Hashman <ehashman@users.noreply.github.com>
This commit is contained in:
afrouz
2021-03-09 14:30:10 +03:30
parent 23d4b3b4f0
commit 27a99045e5
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubelet/config/file.go
View File

@@ -65,7 +65,7 @@ func NewSourceFile(path string, nodeName types.NodeName, period time.Duration, u
path = strings.TrimRight(path, string(os.PathSeparator))
config := newSourceFile(path, nodeName, period, updates)
klog.V(1).Infof("Watching path %q", path)
klog.V(1).InfoS("Watching path", "path", path)
config.run()
}
@@ -95,17 +95,17 @@ func (s *sourceFile) run() {
go func() {
// Read path immediately to speed up startup.
if err := s.listConfig(); err != nil {
klog.Errorf("Unable to read config path %q: %v", s.path, err)
klog.ErrorS(err, "Unable to read config path", "path", s.path)
}
for {
select {
case <-listTicker.C:
if err := s.listConfig(); err != nil {
klog.Errorf("Unable to read config path %q: %v", s.path, err)
klog.ErrorS(err, "Unable to read config path", "path", s.path)
}
case e := <-s.watchEvents:
if err := s.consumeWatchEvent(e); err != nil {
klog.Errorf("Unable to process watch event: %v", err)
klog.ErrorS(err, "Unable to process watch event")
}
}
}
@@ -173,24 +173,24 @@ func (s *sourceFile) extractFromDir(name string) ([]*v1.Pod, error) {
for _, path := range dirents {
statInfo, err := os.Stat(path)
if err != nil {
klog.Errorf("Can't get metadata for %q: %v", path, err)
klog.ErrorS(err, "Could not get metadata", "path", path)
continue
}
switch {
case statInfo.Mode().IsDir():
klog.Errorf("Not recursing into manifest path %q", path)
klog.ErrorS(nil, "Provided manifest path is a directory, not recursing into manifest path", "path", path)
case statInfo.Mode().IsRegular():
pod, err := s.extractFromFile(path)
if err != nil {
if !os.IsNotExist(err) {
klog.Errorf("Can't process manifest file %q: %v", path, err)
klog.ErrorS(err, "Could not process manifest file", "path", path)
}
} else {
pods = append(pods, pod)
}
default:
klog.Errorf("Manifest path %q is not a directory or file: %v", path, statInfo.Mode())
klog.ErrorS(nil, "Manifest path is not a directory or file", "path", path, "mode", statInfo.Mode())
}
}
return pods, nil
@@ -198,7 +198,7 @@ func (s *sourceFile) extractFromDir(name string) ([]*v1.Pod, error) {
// extractFromFile parses a file for Pod configuration information.
func (s *sourceFile) extractFromFile(filename string) (pod *v1.Pod, err error) {
klog.V(3).Infof("Reading config file %q", filename)
klog.V(3).InfoS("Reading config file", "path", filename)
defer func() {
if err == nil && pod != nil {
objKey, keyErr := cache.MetaNamespaceKeyFunc(pod)