Merge pull request kubernetes#47166 from k82cn/type_fix

Kubernetes Submit Queue · web-flow · commit 227f52e0cb14 · 2017-06-19T11:23:58.000-07:00
Automatic merge from submit-queue (batch tested with PRs 46327, 47166)

Fixed typo in comments.

**Which issue this PR fixes** *(optional, in `fixes #&lt;issue number&gt;(, fixes #&lt;issue_number&gt;, ...)` format, will close that issue when PR gets merged)*: fixes # N/A

```release-note
NONE
```
diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go
@@ -320,7 +320,7 @@ func initConfigz(kc *componentconfig.KubeletConfiguration) (*configz.Config, err
 	return cz, err
 }
 
-// validateConfig validates configuration of Kubelet and returns an error is the input configuration is invalid.
+// validateConfig validates configuration of Kubelet and returns an error if the input configuration is invalid.
 func validateConfig(s *options.KubeletServer) error {
 	if !s.CgroupsPerQOS && len(s.EnforceNodeAllocatable) > 0 {
 		return fmt.Errorf("Node Allocatable enforcement is not supported unless Cgroups Per QOS feature is turned on")

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ func initConfigz(kc componentconfig.KubeletConfiguration) (configz.Config, err`
`320`	`320`	`return cz, err`
`321`	`321`	`}`
`322`	`322`
`323`		`-// validateConfig validates configuration of Kubelet and returns an error is the input configuration is invalid.`
	`323`	`+// validateConfig validates configuration of Kubelet and returns an error if the input configuration is invalid.`
`324`	`324`	`func validateConfig(s *options.KubeletServer) error {`
`325`	`325`	`if !s.CgroupsPerQOS && len(s.EnforceNodeAllocatable) > 0 {`
`326`	`326`	`return fmt.Errorf("Node Allocatable enforcement is not supported unless Cgroups Per QOS feature is turned on")`