github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 07:39:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47166 from k82cn/type_fix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46327, 47166)

Fixed typo in comments.

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

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-06-19 11:23:58 -07:00 committed by GitHub
commit 227f52e0cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubelet/app/server.go
View File

@ -320,7 +320,7 @@ func initConfigz(kc *componentconfig.KubeletConfiguration) (*configz.Config, err
return cz, 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 { func validateConfig(s *options.KubeletServer) error {
if !s.CgroupsPerQOS && len(s.EnforceNodeAllocatable) > 0 { if !s.CgroupsPerQOS && len(s.EnforceNodeAllocatable) > 0 {
return fmt.Errorf("Node Allocatable enforcement is not supported unless Cgroups Per QOS feature is turned on") return fmt.Errorf("Node Allocatable enforcement is not supported unless Cgroups Per QOS feature is turned on")