Merge pull request #58933 from hanxiaoshuai/master

Automatic merge from submit-queue (batch tested with PRs 58914, 58933). 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>. The TODO has been completed, so remove the comments The TODO has been completed in [PR](https://github.com/kubernetes/kubernetes/commit/eeb582e53f76aee9b70a051e1fe0199e8f572bae#diff-0b1de4365e4b0b50a13f26ff0718342b) so remove the comments.

Merge pull request #58933 from hanxiaoshuai/master
e72c6c69 · Kubernetes Submit Queue · GitHub · 7cd474f5 · 36909671 · e72c6c69
Unverified Commit e72c6c69 authored Jan 30, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

services.go pkg/master/services.go +0 -1

No files found.
--- a/pkg/master/services.go
+++ b/pkg/master/services.go
@@ -27,7 +27,6 @@ import (

 // DefaultServiceIPRange takes a the serviceIPRange flag and returns the defaulted service ip range (if  needed),
 // api server service IP, and an error
-// TODO move this out of the genericapiserver package
 func DefaultServiceIPRange(passedServiceClusterIPRange net.IPNet) (net.IPNet, net.IP, error) {
 	serviceClusterIPRange := passedServiceClusterIPRange
 	if passedServiceClusterIPRange.IP == nil {