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

Merge pull request #9866 from afbjorklund/podman-network-fix 

Fix podman network inspect format and error
pull/9933/head
Thomas Strömberg 2020-12-11 10:20:46 -08:00 committed by GitHub
parent 86b9397910 a6941f21ca
commit b4bf2bde33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,14 +38,21 @@ const firstSubnetAddr = "192.168.49.0"
const defaultSubnetMask = 24 const defaultSubnetMask = 24
// name of the default bridge network, used to lookup the MTU (see #9528) // name of the default bridge network, used to lookup the MTU (see #9528)
const defaultBridgeName = "bridge" const dockerDefaultBridge = "bridge"
// name of the default bridge network
const podmanDefaultBridge = "podman"
// CreateNetwork creates a network returns gateway and error, minikube creates one network per cluster // CreateNetwork creates a network returns gateway and error, minikube creates one network per cluster
func CreateNetwork(ociBin string, name string) (net.IP, error) { func CreateNetwork(ociBin string, clusterName string) (net.IP, error) {
return createDockerNetwork(ociBin, name) var defaultBridgeName string
} if ociBin == Docker {
defaultBridgeName = dockerDefaultBridge
}
if ociBin == Podman {
defaultBridgeName = podmanDefaultBridge
}
func createDockerNetwork(ociBin string, clusterName string) (net.IP, error) {
// check if the network already exists // check if the network already exists
info, err := containerNetworkInspect(ociBin, clusterName) info, err := containerNetworkInspect(ociBin, clusterName)
if err == nil { if err == nil {
@ -124,6 +131,9 @@ func tryCreateDockerNetwork(ociBin string, subnetAddr string, subnetMask int, mt
if strings.Contains(rr.Output(), "failed to allocate gateway") && strings.Contains(rr.Output(), "Address already in use") { if strings.Contains(rr.Output(), "failed to allocate gateway") && strings.Contains(rr.Output(), "Address already in use") {
return nil, ErrNetworkGatewayTaken return nil, ErrNetworkGatewayTaken
} }
if strings.Contains(rr.Output(), "is being used by a network interface") {
return nil, ErrNetworkGatewayTaken
}
return nil, errors.Wrapf(err, "create network %s", fmt.Sprintf("%s %s/%d", name, subnetAddr, subnetMask)) return nil, errors.Wrapf(err, "create network %s", fmt.Sprintf("%s %s/%d", name, subnetAddr, subnetMask))
} }
return gateway, nil return gateway, nil
@ -191,7 +201,7 @@ func dockerNetworkInspect(name string) (netInfo, error) {
func podmanNetworkInspect(name string) (netInfo, error) { func podmanNetworkInspect(name string) (netInfo, error) {
var info = netInfo{name: name} var info = netInfo{name: name}
cmd := exec.Command(Podman, "network", "inspect", name, "--format", `{{(index .IPAM.Config 0).Subnet}},{{(index .IPAM.Config 0).Gateway}}`) cmd := exec.Command(Podman, "network", "inspect", name, "--format", `{{range .plugins}}{{if eq .type "bridge"}}{{(index (index .ipam.ranges 0) 0).subnet}},{{(index (index .ipam.ranges 0) 0).gateway}}{{end}}{{end}}`)
rr, err := runCmd(cmd) rr, err := runCmd(cmd)
if err != nil { if err != nil {
logDockerNetworkInspect(Podman, name) logDockerNetworkInspect(Podman, name)