fix: regression for docker bridge gw check on darwin dind (srl-labs#2364)

carlmontanari · web-flow · commit 34cb5d0e0db0 · 2024-12-30T11:52:20.000+01:00
diff --git a/runtime/docker/docker.go b/runtime/docker/docker.go
@@ -320,7 +320,13 @@ func getMgmtBridgeIPs(bridgeName string, netResource networkapi.Inspect) (string
 			}
 		}
 	}
-	return v4, v6, err
+
+	// didnt find any gateways, fallthrough to returning the error
+	if v4 == "" && v6 == "" {
+		return "", "", err
+	}
+
+	return v4, v6, nil
 }
 
 // postCreateNetActions performs additional actions after the network has been created.

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,13 @@ func getMgmtBridgeIPs(bridgeName string, netResource networkapi.Inspect) (string`
`320`	`320`	`}`
`321`	`321`	`}`
`322`	`322`	`}`
`323`		`- return v4, v6, err`
	`323`	`+`
	`324`	`+ // didnt find any gateways, fallthrough to returning the error`
	`325`	`+ if v4 == "" && v6 == "" {`
	`326`	`+ return "", "", err`
	`327`	`+ }`
	`328`	`+`
	`329`	`+ return v4, v6, nil`
`324`	`330`	`}`
`325`	`331`
`326`	`332`	`// postCreateNetActions performs additional actions after the network has been created.`