From 095b4b4596cd7808b991f7757c12c09d42aa5053 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Mon, 2 Mar 2020 13:51:44 -0800 Subject: [PATCH] small fixes --- Makefile | 6 ++++++ pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 374844ab3..413a52843 100755 --- a/Makefile +++ b/Makefile @@ -365,8 +365,14 @@ out/linters/golangci-lint-$(GOLINT_VERSION): # this one is meant for local use .PHONY: lint +ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) +lint: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go + docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:$(GOLINT_VERSION) \ + golangci-lint run ${GOLINT_OPTIONS} --skip-dirs "cmd/drivers/kvm|cmd/drivers/hyperkit|pkg/drivers/kvm|pkg/drivers/hyperkit" ./... +else lint: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go out/linters/golangci-lint-$(GOLINT_VERSION) ## Run lint ./out/linters/golangci-lint-$(GOLINT_VERSION) run ${GOLINT_OPTIONS} ./... +endif # lint-ci is slower version of lint and is meant to be used in ci (travis) to avoid out of memory leaks. .PHONY: lint-ci diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 0f229901c..59573563b 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -427,12 +427,8 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error { glog.Warningf("unable to stop kubelet: %s command: %q output: %q", err, rr.Command(), rr.Output()) } - // Skip transfer if using preloaded kic volume - skipTransfer := oci.PreloadedVolumeAttached(cfg.KubernetesConfig.KubernetesVersion, viper.GetString(config.MachineProfile)) - if !skipTransfer { - if err := bsutil.TransferBinaries(cfg.KubernetesConfig, k.c); err != nil { - return errors.Wrap(err, "downloading binaries") - } + if err := bsutil.TransferBinaries(cfg.KubernetesConfig, k.c); err != nil { + return errors.Wrap(err, "downloading binaries") } var cniFile []byte -- GitLab