Merge pull request #7297 from afbjorklund/cleanup-master

Fix gofmt and golint on master, after merges
kubernetes · Mar 28, 2020 · 1e70286 · 1e70286
2 parents 356e203 + 73dd991
commit 1e70286
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -231,6 +231,7 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 	return nil
 }
 
+// APIServerVersionMatch checks if the server version matches the expected
 func APIServerVersionMatch(client *kubernetes.Clientset, expected string) error {
 	vi, err := client.ServerVersion()
 	if err != nil {

diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go
@@ -129,6 +129,7 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node)
 	return copyableFiles, nil
 }
 
+// CACerts has cert and key for CA (and Proxy)
 type CACerts struct {
 	caCert    string
 	caKey     string

diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// mustload loads minikube clusters, exiting with user-friendly messages
+// Package mustload loads minikube clusters, exiting with user-friendly messages
 package mustload
 
 import (
@@ -37,6 +37,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
+// ClusterController holds all the needed information for a minikube cluster
 type ClusterController struct {
 	Config   *config.ClusterConfig
 	API      libmachine.API

diff --git a/pkg/minikube/tunnel/route_freebsd.go b/pkg/minikube/tunnel/route_freebsd.go
@@ -164,5 +164,3 @@ func (router *osRouter) Cleanup(route *Route) error {
 	}
 	return nil
 }
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -164,5 +164,3 @@ func (router osRouter) Cleanup(route Route) error {
		}
		return nil
		}