From 73dd9914f61ad8a68fcbe83f71f37adcf0e5a7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 28 Mar 2020 12:25:32 +0100 Subject: [PATCH] Fix gofmt and golint on master, after merges --- pkg/minikube/bootstrapper/bsutil/kverify/kverify.go | 1 + pkg/minikube/bootstrapper/certs.go | 1 + pkg/minikube/mustload/mustload.go | 3 ++- pkg/minikube/tunnel/route_freebsd.go | 2 -- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go index 6f47fc3204..b80f0689e4 100644 --- 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 index cbd9d27b86..28ea6e5295 100644 --- 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 index e9703c1746..9897102638 100644 --- 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 index d88d5301ca..19cd4e4ad3 100644 --- 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 } - -