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

Simplify the code

pull/11300/head
Ilya Zuyev 2021-05-06 11:17:43 -07:00
parent 6e2eae0d0a
commit a1ae930d2f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/drivers/kic/oci/network.go
View File

@ -84,12 +84,11 @@ func gatewayIP(ociBin, containerName string) (string, error) {
// check .NetworkSettings.Networks["cluster-name"].Gateway and then
// .NetworkSettings.Networks["bridge"|"podman"].Gateway
for _, network := range []string{containerName, defaultBridgeName(ociBin)} {
format := fmt.Sprintf("{{(index .NetworkSettings.Networks %q).Gateway}}", network)
rr, err = runCmd(exec.Command(ociBin, "container", "inspect", "--format", format, containerName))
gatewayIP, err := networkGateway(ociBin, containerName, network)
if err != nil {
return "", errors.Wrapf(err, "inspect gateway")
return "", err
}
if gatewayIP := strings.TrimSpace(rr.Stdout.String()); gatewayIP != "" {
if gatewayIP != "" {
return gatewayIP, nil
}
}
@ -97,6 +96,15 @@ func gatewayIP(ociBin, containerName string) (string, error) {
return "", nil
}
func networkGateway(ociBin, container, network string) (string, error) {
format := fmt.Sprintf("{{(index .NetworkSettings.Networks %q).Gateway}}", network)
rr, err := runCmd(exec.Command(ociBin, "container", "inspect", "--format", format, container))
if err != nil {
return "", errors.Wrapf(err, "inspect gateway")
}
return strings.TrimSpace(rr.Stdout.String()), nil
}
// containerGatewayIP gets the default gateway ip for the container
func containerGatewayIP(ociBin string, containerName string) (net.IP, error) {
gatewayIP, err := gatewayIP(ociBin, containerName)