github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #72818 from humblec/md-2 

Remove explicit nil initialization and correct error string.
pull/564/head
Kubernetes Prow Robot 2019-01-28 21:52:03 -08:00 committed by GitHub
parent 44d1859205 428dc5ce58
commit 3c34d28fe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/hyperkube/main.go
View File

@ -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
} }

4
cmd/kube-controller-manager/app/core.go
View File

@ -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

1
hack/.golint_failures
View File

@ -1,5 +1,4 @@
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

2
pkg/controller/endpoint/doc.go
View File

@ -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"