Unverified Commit 3c34d28f authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub

Merge pull request #72818 from humblec/md-2

Remove explicit nil initialization and correct error string.
parents 44d18592 428dc5ce
...@@ -170,7 +170,7 @@ func makeSymlinks(targetName string, commandFns []func() *cobra.Command) error { ...@@ -170,7 +170,7 @@ func makeSymlinks(targetName string, commandFns []func() *cobra.Command) error {
} }
if errs { if errs {
return errors.New("Error creating one or more symlinks.") return errors.New("Error creating one or more symlinks")
} }
return nil return nil
} }
...@@ -82,8 +82,8 @@ func startServiceController(ctx ControllerContext) (http.Handler, bool, error) { ...@@ -82,8 +82,8 @@ func startServiceController(ctx ControllerContext) (http.Handler, bool, error) {
} }
func startNodeIpamController(ctx ControllerContext) (http.Handler, bool, error) { func startNodeIpamController(ctx ControllerContext) (http.Handler, bool, error) {
var clusterCIDR *net.IPNet = nil var clusterCIDR *net.IPNet
var serviceCIDR *net.IPNet = nil var serviceCIDR *net.IPNet
if !ctx.ComponentConfig.KubeCloudShared.AllocateNodeCIDRs { if !ctx.ComponentConfig.KubeCloudShared.AllocateNodeCIDRs {
return nil, false, nil return nil, false, nil
......
cmd/cloud-controller-manager/app/apis/config/v1alpha1 cmd/cloud-controller-manager/app/apis/config/v1alpha1
cmd/hyperkube
cmd/kube-apiserver/app cmd/kube-apiserver/app
cmd/kube-controller-manager/app cmd/kube-controller-manager/app
cmd/kube-proxy/app cmd/kube-proxy/app
......
...@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and ...@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package service provides EndpointController implementation // Package endpoint provides EndpointController implementation
// to manage and sync service endpoints. // to manage and sync service endpoints.
package endpoint // import "k8s.io/kubernetes/pkg/controller/endpoint" package endpoint // import "k8s.io/kubernetes/pkg/controller/endpoint"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment