Merge pull request #57494 from stewart-yu/fixFunctionError

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix unstandardized function name new() **What this PR does / why we need it**: fix unstandardized function name, rename new() to newSourceFile() **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes [https://github.com/kubernetes/kubernetes/issues/57495](https://github.com/kubernetes/kubernetes/issues/57495) **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #57494 from stewart-yu/fixFunctionError
933272d2 · Kubernetes Submit Queue · GitHub · 18758f50 · 3432741b · 933272d2
Unverified Commit 933272d2 authored Dec 27, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

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.
--- a/pkg/kubelet/config/file.go
+++ b/pkg/kubelet/config/file.go
@@ -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 := newSourceFile(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 newSourceFile(path string, nodeName types.NodeName, period time.Duration, updates chan<- interface{}) *sourceFile {
 	send := func(objs []interface{}) {
 		var pods []*v1.Pod
 		for _, o := range objs {

--- a/pkg/kubelet/config/file_linux_test.go
+++ b/pkg/kubelet/config/file_linux_test.go
@@ -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 := newSourceFile("/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 := newSourceFile(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 := newSourceFile(dirName, "localhost", time.Millisecond, ch)
 	err = c.resetStoreFromPath()
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)