From 62904e5dccfeaf75213bbe58a59cbb58bd75fe54 Mon Sep 17 00:00:00 2001 From: Alonyb Date: Wed, 15 Apr 2020 09:30:10 -0500 Subject: [PATCH] fix lint --- pkg/addons/addons.go | 7 ++++--- pkg/drivers/kic/kic.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index 9a86e1a01..b147af458 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -18,7 +18,6 @@ package addons import ( "fmt" - "k8s.io/minikube/pkg/drivers/kic" "path" "runtime" "sort" @@ -29,6 +28,8 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" + + "k8s.io/minikube/pkg/drivers/kic" "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/command" "k8s.io/minikube/pkg/minikube/config" @@ -181,10 +182,10 @@ https://github.com/kubernetes/minikube/issues/7332`, out.V{"driver_name": cc.Dri if driver.IsKIC(cc.Driver) && runtime.GOOS != "linux" { port, err := kic.GetRegistryAddonPort(cc) if err != nil { - errors.Wrap(err, "registry port") + return errors.Wrap(err, "registry port") } out.T(out.Documentation, `Registry addon on with {{.driver}} uses {{.port}} please use that. -For more information see: https://minikube.sigs.k8s.io/docs/drivers/docker/#install-docker to documentation`, out.V{"driver":cc.Driver, "port": port}) +For more information see: https://minikube.sigs.k8s.io/docs/drivers/docker/#install-docker to documentation`, out.V{"driver": cc.Driver, "port": port}) } } diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index c0b161b8c..fda3733ed 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -18,7 +18,6 @@ package kic import ( "fmt" - "k8s.io/minikube/pkg/minikube/config" "net" "os/exec" "strconv" @@ -36,6 +35,7 @@ import ( "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/command" + "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/cruntime" "k8s.io/minikube/pkg/minikube/download" -- GitLab