From 9e638676e9a77747c1eb25f3f8a3163982e43d62 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Fri, 18 Jan 2019 09:29:25 +0530 Subject: [PATCH 1/2] Remove explicit nil initialization and correct error string. Signed-off-by: Humble Chirammal --- cmd/hyperkube/main.go | 2 +- cmd/kube-controller-manager/app/core.go | 4 ++-- pkg/controller/endpoint/doc.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go index 2294c37dad..a5bfb2ad38 100644 --- a/cmd/hyperkube/main.go +++ b/cmd/hyperkube/main.go @@ -170,7 +170,7 @@ func makeSymlinks(targetName string, commandFns []func() *cobra.Command) error { } if errs { - return errors.New("Error creating one or more symlinks.") + return errors.New("Error creating one or more symlinks") } return nil } diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index 5111f77a66..30b3a4772f 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/cmd/kube-controller-manager/app/core.go @@ -82,8 +82,8 @@ func startServiceController(ctx ControllerContext) (http.Handler, bool, error) { } func startNodeIpamController(ctx ControllerContext) (http.Handler, bool, error) { - var clusterCIDR *net.IPNet = nil - var serviceCIDR *net.IPNet = nil + var clusterCIDR *net.IPNet + var serviceCIDR *net.IPNet if !ctx.ComponentConfig.KubeCloudShared.AllocateNodeCIDRs { return nil, false, nil diff --git a/pkg/controller/endpoint/doc.go b/pkg/controller/endpoint/doc.go index b3d86af747..dbd3d1045d 100644 --- a/pkg/controller/endpoint/doc.go +++ b/pkg/controller/endpoint/doc.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package service provides EndpointController implementation +// Package endpoint provides EndpointController implementation // to manage and sync service endpoints. package endpoint // import "k8s.io/kubernetes/pkg/controller/endpoint" From 428dc5ce5820224d845ff43a8856541169f7e61e Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Fri, 18 Jan 2019 10:20:30 +0530 Subject: [PATCH 2/2] Remove cmd/hypercube from hack/.golint_failures Signed-off-by: Humble Chirammal --- hack/.golint_failures | 1 - 1 file changed, 1 deletion(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index 1c5e2fa961..2fa3d9cc27 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -1,6 +1,5 @@ cluster/images/etcd-version-monitor cmd/cloud-controller-manager/app/apis/config/v1alpha1 -cmd/hyperkube cmd/kube-apiserver/app cmd/kube-controller-manager/app cmd/kube-proxy/app