From 45acbec3703ff38599e2cd9b6d366a6cda49857e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 20 Feb 2022 12:41:03 +0100 Subject: [PATCH] Upgrade to latest docker-machine-driver-qemu Copy some of the default values from the regular setup, that is not used when not using docker-machine config. --- go.mod | 2 +- go.sum | 2 ++ pkg/minikube/registry/drvs/qemu/qemu.go | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2596f3394515..8fa28fe473b5 100644 --- a/go.mod +++ b/go.mod @@ -155,7 +155,7 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.13.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/machine-drivers/docker-machine-driver-qemu v0.1.0 + github.com/machine-drivers/docker-machine-driver-qemu v0.1.1-0.20180730160045-1d6b42f755d0 github.com/magiconair/properties v1.8.5 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect diff --git a/go.sum b/go.sum index 47ff038ce035..936345445db0 100644 --- a/go.sum +++ b/go.sum @@ -788,6 +788,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/machine-drivers/docker-machine-driver-qemu v0.1.0 h1:r5bMzOqca0dZuCkn/8vCM8QNpdsLPCVZ6VP5z/IU0HM= github.com/machine-drivers/docker-machine-driver-qemu v0.1.0/go.mod h1:1gevpWYcs2Gmvt9G9T6AbeRw9tGnQdQiKt56B7n2X7g= +github.com/machine-drivers/docker-machine-driver-qemu v0.1.1-0.20180730160045-1d6b42f755d0 h1:1Yo+YdvX8hKRqAwFPLcR58DJgOhbZ1Sh2LPP1xtIMVA= +github.com/machine-drivers/docker-machine-driver-qemu v0.1.1-0.20180730160045-1d6b42f755d0/go.mod h1:1gevpWYcs2Gmvt9G9T6AbeRw9tGnQdQiKt56B7n2X7g= github.com/machine-drivers/docker-machine-driver-vmware v0.1.5 h1:51GqJ84u9EBATnn8rWsHNavcuRPlCLnDmvjzZVuliwY= github.com/machine-drivers/docker-machine-driver-vmware v0.1.5/go.mod h1:dTnTzUH3uzhMo0ddV1zRjGYWcVhQWwqiHPxz5l+HPd0= github.com/machine-drivers/machine v0.7.1-0.20211105063445-78a84df85426 h1:gVDPCmqwvHQ4ox/9svvnkomYJAAiV59smbPdTK4DIm4= diff --git a/pkg/minikube/registry/drvs/qemu/qemu.go b/pkg/minikube/registry/drvs/qemu/qemu.go index bd4b9e7eca34..e9f13016603b 100644 --- a/pkg/minikube/registry/drvs/qemu/qemu.go +++ b/pkg/minikube/registry/drvs/qemu/qemu.go @@ -19,6 +19,7 @@ package qemu import ( "fmt" "os/exec" + "path/filepath" "runtime" "github.com/docker/machine/libmachine/drivers" @@ -59,6 +60,9 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { DiskSize: cc.DiskSize, Memory: cc.Memory, CPU: cc.CPUs, + EnginePort: 2376, + FirstQuery: true, + DiskPath: filepath.Join(localpath.MiniPath(), "machines", name, fmt.Sprintf("%s.img", name)), }, nil }