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

Merge pull request #9426 from priyawadhwa/drv-cp-endpoint 

Add further debugging for DRV_CP_ENDPOINT failure
pull/9435/head
Medya Ghazizadeh 2020-10-09 16:55:38 -05:00 committed by GitHub
parent 4216496bec acd5a7a4c8
commit 567d2f2f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/drivers/kic/oci/errors.go
View File

@ -67,14 +67,14 @@ var ErrNetworkInUse = errors.New("unable to delete a network that is attached to
func LogContainerDebug(ociBin string, name string) string {
rr, err := containerInspect(ociBin, name)
if err != nil {
glog.Warningf("Filed to get postmortem inspect. %s :%v", rr.Command(), err)
glog.Warningf("Failed to get postmortem inspect. %s :%v", rr.Command(), err)
} else {
glog.Infof("Postmortem inspect (%q): %s", rr.Command(), rr.Output())
}
rr, err = containerLogs(ociBin, name)
if err != nil {
glog.Warningf("Filed to get postmortem logs. %s :%v", rr.Command(), err)
glog.Warningf("Failed to get postmortem logs. %s :%v", rr.Command(), err)
} else {
glog.Infof("Postmortem logs (%q): %s", rr.Command(), rr.Output())
}
@ -85,6 +85,7 @@ func LogContainerDebug(ociBin string, name string) string {
} else {
glog.Infof("postmortem docker info: %+v", di)
}
logDockerNetworkInspect(name)
} else {
pi, err := podmanSystemInfo()
if err != nil {

14
pkg/drivers/kic/oci/network_create.go
View File

@ -100,8 +100,10 @@ func tryCreateDockerNetwork(subnetAddr string, subnetMask int, name string) (net
// returns subnet and gate if exists
func dockerNetworkInspect(name string) (*net.IPNet, net.IP, error) {
rr, err := runCmd(exec.Command(Docker, "network", "inspect", name, "--format", "{{(index .IPAM.Config 0).Subnet}},{{(index .IPAM.Config 0).Gateway}}"))
cmd := exec.Command(Docker, "network", "inspect", name, "--format", "{{(index .IPAM.Config 0).Subnet}},{{(index .IPAM.Config 0).Gateway}}")
rr, err := runCmd(cmd)
if err != nil {
logDockerNetworkInspect(name)
if strings.Contains(rr.Output(), "No such network") {
return nil, nil, ErrNetworkNotFound
}
@ -124,6 +126,16 @@ func dockerNetworkInspect(name string) (*net.IPNet, net.IP, error) {
return subnet, gateway, nil
}
func logDockerNetworkInspect(name string) {
cmd := exec.Command(Docker, "network", "inspect", name)
glog.Infof("running %v to gather additional debugging logs...", cmd.Args)
rr, err := runCmd(cmd)
if err != nil {
glog.Infof("error running %v: %v", rr.Args, err)
}
glog.Infof("output of %v: %v", rr.Args, rr.Output())
}
// RemoveNetwork removes a network
func RemoveNetwork(name string) error {
if !networkExists(name) {