kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Explicitly set LIBVIRT_DEFAULT_URI default for health checking

pull/6276/head
tstromberg 2020-01-10 15:49:01 -08:00
parent 444b36161b
commit 5008d4cdc9
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/minikube/registry/drvs/kvm2/kvm2.go
View File

@ -20,6 +20,7 @@ package kvm2
import ( import (
"fmt" "fmt"
"os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strings" "strings"
@ -86,13 +87,25 @@ func configure(mc config.MachineConfig) interface{} {
} }
} }
// defaultURI returns the QEMU URI to connect to for health checks
func defaultURI() string {
u := os.Getenv("LIBVIRT_DEFAULT_URI")
if u != "" {
return u
}
return "qemu:///system"
}
func status() registry.State { func status() registry.State {
path, err := exec.LookPath("virsh") path, err := exec.LookPath("virsh")
if err != nil { if err != nil {
return registry.State{Error: err, Fix: "Install libvirt", Doc: docURL} return registry.State{Error: err, Fix: "Install libvirt", Doc: docURL}
} }
// On Ubuntu 19.10 (libvirt 5.4), this fails if LIBVIRT_DEFAULT_URI is unset
cmd := exec.Command(path, "domcapabilities", "--virttype", "kvm") cmd := exec.Command(path, "domcapabilities", "--virttype", "kvm")
cmd.Env = append(os.Environ(), fmt.Sprintf("LIBVIRT_DEFAULT_URI=%s", defaultURI()))
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return registry.State{ return registry.State{
@ -104,6 +117,7 @@ func status() registry.State {
} }
cmd = exec.Command("virsh", "list") cmd = exec.Command("virsh", "list")
cmd.Env = append(os.Environ(), fmt.Sprintf("LIBVIRT_DEFAULT_URI=%s", defaultURI()))
out, err = cmd.CombinedOutput() out, err = cmd.CombinedOutput()
if err != nil { if err != nil {
return registry.State{ return registry.State{