resolve circular import problem

cmd/minikube/cmd/start.go

@@ -45,6 +45,7 @@ import (
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/drivers"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/kubeadm"
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/command"
@@ -297,7 +298,7 @@ func runStart(cmd *cobra.Command, args []string) {
 	v, err := version.GetSemverVersion()
 	if err != nil {
 		out.WarningT("Error parsing minikube version: {{.error}}", out.V{"error": err})
-	} else if err := drivers.InstallOrUpdate(driver, constants.MakeMiniPath("bin"), v, viper.GetBool(interactive)); err != nil {
+	} else if err := drivers.InstallOrUpdate(driver, localpath.MakeMiniPath("bin"), v, viper.GetBool(interactive)); err != nil {
 		out.WarningT("Unable to update {{.driver}} driver: {{.error}}", out.V{"driver": driver, "error": err})
 	}
 
@@ -551,7 +552,7 @@ func selectImageRepository(mirrorCountry string, k8sVersion string) (bool, strin
 	}
 
 	checkRepository := func(repo string) error {
-		podInfraContainerImage, _ := constants.GetKubeadmCachedImages(repo, k8sVersion)
+		podInfraContainerImage, _ := images.CachedImages(repo, k8sVersion)
 
 		ref, err := name.ParseReference(podInfraContainerImage, name.WeakValidation)
 		if err != nil {

pkg/minikube/bootstrapper/bootstrapper.go

@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
-	"k8s.io/minikube/pkg/minikube/kubeadm"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 )
 
 // LogOptions are options to be passed to LogCommands
@@ -68,7 +68,7 @@ func GetCachedBinaryList(bootstrapper string) []string {
 func GetCachedImageList(imageRepository string, version string, bootstrapper string) []string {
 	switch bootstrapper {
 	case BootstrapperTypeKubeadm:
-		_, images := kubeadm.CachedImages(imageRepository, version)
+		_, images := images.CachedImages(imageRepository, version)
 		return images
 	default:
 		return []string{}

pkg/minikube/bootstrapper/images/images.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubeadm
+package images
 
 import (
 	"runtime"
@@ -22,6 +22,7 @@ import (
 
 	"github.com/blang/semver"
 	"github.com/golang/glog"
+	minikubeVersion "k8s.io/minikube/pkg/version"
 )
 
 // CachedImages gets the images to cache for kubeadm for a version

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

@@ -43,6 +43,7 @@ import (
 	"k8s.io/minikube/pkg/kapi"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
@@ -548,7 +549,7 @@ func NewKubeletConfig(k8s config.KubernetesConfig, r cruntime.Manager) ([]byte,
 		extraOpts["network-plugin"] = k8s.NetworkPlugin
 	}
 
-	podInfraContainerImage, _ := CachedImages(k8s.ImageRepository, k8s.KubernetesVersion)
+	podInfraContainerImage, _ := images.CachedImages(k8s.ImageRepository, k8s.KubernetesVersion)
 	if _, ok := extraOpts["pod-infra-container-image"]; !ok && k8s.ImageRepository != "" && podInfraContainerImage != "" {
 		extraOpts["pod-infra-container-image"] = podInfraContainerImage
 	}
@@ -582,7 +583,7 @@ func NewKubeletConfig(k8s config.KubernetesConfig, r cruntime.Manager) ([]byte,
 
 // UpdateCluster updates the cluster
 func (k *Bootstrapper) UpdateCluster(cfg config.KubernetesConfig) error {
-	_, images := CachedImages(cfg.ImageRepository, cfg.KubernetesVersion)
+	_, images := images.CachedImages(cfg.ImageRepository, cfg.KubernetesVersion)
 	if cfg.ShouldLoadCachedImages {
 		if err := machine.LoadImages(k.c, images, constants.ImageCacheDir); err != nil {
 			out.FailureT("Unable to load cached images: {{.error}}", out.V{"error": err})

test/integration/a_download_only_test.go

@@ -29,6 +29,7 @@ import (
 	"testing"
 	"time"
 
+	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/localpath"
 )
@@ -57,7 +58,7 @@ func TestDownloadOnly(t *testing.T) {
 
 				// None driver does not cache images, so this test will fail
 				if !NoneDriver() {
-					_, imgs := constants.GetKubeadmCachedImages("", v)
+					_, imgs := images.CachedImages("", v)
 					for _, img := range imgs {
 						img = strings.Replace(img, ":", "_", 1) // for example kube-scheduler:v1.15.2 --> kube-scheduler_v1.15.2
 						fp := filepath.Join(localpath.MiniPath(), "cache", "images", img)