Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
3432741b
Commit
3432741b
authored
Dec 21, 2017
by
stewart-yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[kubelet]fix unstandardized function name, rename new() to newSourceFile()
parent
21cae16b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
file.go
pkg/kubelet/config/file.go
+2
-2
file_linux_test.go
pkg/kubelet/config/file_linux_test.go
+3
-3
No files found.
pkg/kubelet/config/file.go
View file @
3432741b
...
...
@@ -48,12 +48,12 @@ func NewSourceFile(path string, nodeName types.NodeName, period time.Duration, u
// "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
SourceFile
(
path
,
nodeName
,
period
,
updates
)
glog
.
V
(
1
)
.
Infof
(
"Watching path %q"
,
path
)
go
wait
.
Forever
(
config
.
run
,
period
)
}
func
new
(
path
string
,
nodeName
types
.
NodeName
,
period
time
.
Duration
,
updates
chan
<-
interface
{})
*
sourceFile
{
func
new
SourceFile
(
path
string
,
nodeName
types
.
NodeName
,
period
time
.
Duration
,
updates
chan
<-
interface
{})
*
sourceFile
{
send
:=
func
(
objs
[]
interface
{})
{
var
pods
[]
*
v1
.
Pod
for
_
,
o
:=
range
objs
{
...
...
pkg/kubelet/config/file_linux_test.go
View file @
3432741b
...
...
@@ -46,7 +46,7 @@ import (
func
TestExtractFromNonExistentFile
(
t
*
testing
.
T
)
{
ch
:=
make
(
chan
interface
{},
1
)
c
:=
new
(
"/some/fake/file"
,
"localhost"
,
time
.
Millisecond
,
ch
)
c
:=
new
SourceFile
(
"/some/fake/file"
,
"localhost"
,
time
.
Millisecond
,
ch
)
err
:=
c
.
watch
()
if
err
==
nil
{
t
.
Errorf
(
"Expected error"
)
...
...
@@ -137,7 +137,7 @@ func TestExtractFromBadDataFile(t *testing.T) {
}
ch
:=
make
(
chan
interface
{},
1
)
c
:=
new
(
fileName
,
"localhost"
,
time
.
Millisecond
,
ch
)
c
:=
new
SourceFile
(
fileName
,
"localhost"
,
time
.
Millisecond
,
ch
)
err
=
c
.
resetStoreFromPath
()
if
err
==
nil
{
t
.
Fatalf
(
"expected error, got nil"
)
...
...
@@ -153,7 +153,7 @@ func TestExtractFromEmptyDir(t *testing.T) {
defer
os
.
RemoveAll
(
dirName
)
ch
:=
make
(
chan
interface
{},
1
)
c
:=
new
(
dirName
,
"localhost"
,
time
.
Millisecond
,
ch
)
c
:=
new
SourceFile
(
dirName
,
"localhost"
,
time
.
Millisecond
,
ch
)
err
=
c
.
resetStoreFromPath
()
if
err
!=
nil
{
t
.
Fatalf
(
"unexpected error: %v"
,
err
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment