github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Reverted Formatting

Browse Source
This commit is contained in:
Nils Carstensen 2024-08-24 22:11:39 +02:00
parent c47a517c5b
commit 6dccf759f7
No known key found for this signature in database
GPG Key ID: 1F25989330BF84C3
1 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,12 +51,7 @@ type sourceFile struct {
} }
// NewSourceFile watches a config file for changes. // NewSourceFile watches a config file for changes.
func NewSourceFile( func NewSourceFile(path string, nodeName types.NodeName, period time.Duration, updates chan<- interface{}) {
path string,
nodeName types.NodeName,
period time.Duration,
updates chan<- interface{},
) {
// "github.com/sigma/go-inotify" requires a path without trailing "/" // "github.com/sigma/go-inotify" requires a path without trailing "/"
path = strings.TrimRight(path, string(os.PathSeparator)) path = strings.TrimRight(path, string(os.PathSeparator))
@ -65,12 +60,7 @@ func NewSourceFile(
config.run() config.run()
} }
func newSourceFile( func newSourceFile(path string, nodeName types.NodeName, period time.Duration, updates chan<- interface{}) *sourceFile {
path string,
nodeName types.NodeName,
period time.Duration,
updates chan<- interface{},
) *sourceFile {
send := func(objs []interface{}) { send := func(objs []interface{}) {
var pods []*v1.Pod var pods []*v1.Pod
for _, o := range objs { for _, o := range objs {
@ -180,12 +170,7 @@ func (s *sourceFile) extractFromDir(name string) ([]*v1.Pod, error) {
switch { switch {
case statInfo.Mode().IsDir(): case statInfo.Mode().IsDir():
klog.ErrorS( klog.ErrorS(nil, "Provided manifest path is a directory, not recursing into manifest path", "path", path)
nil,
"Provided manifest path is a directory, not recursing into manifest path",
"path",
path,
)
case statInfo.Mode().IsRegular(): case statInfo.Mode().IsRegular():
pod, err := s.extractFromFile(path) pod, err := s.extractFromFile(path)
if err != nil { if err != nil {
@ -196,14 +181,7 @@ func (s *sourceFile) extractFromDir(name string) ([]*v1.Pod, error) {
pods = append(pods, pod) pods = append(pods, pod)
} }
default: default:
klog.ErrorS( klog.ErrorS(nil, "Manifest path is not a directory or file", "path", path, "mode", statInfo.Mode())
nil,
"Manifest path is not a directory or file",
"path",
path,
"mode",
statInfo.Mode(),
)
} }
} }
return pods, nil return pods, nil
@ -246,11 +224,7 @@ func (s *sourceFile) extractFromFile(filename string) (pod *v1.Pod, err error) {
return pod, nil return pod, nil
} }
return pod, fmt.Errorf( return pod, fmt.Errorf("%v: couldn't parse as pod(%v), please check config file", filename, podErr)
"%v: couldn't parse as pod(%v), please check config file",
filename,
podErr,
)
} }
func (s *sourceFile) replaceStore(pods ...*v1.Pod) (err error) { func (s *sourceFile) replaceStore(pods ...*v1.Pod) (err error) {