Skip to content

Commit

Permalink
Merge pull request #2910 from BenTheElder/podman-overlap
Browse files Browse the repository at this point in the history
check for new podman overlap error message
  • Loading branch information
k8s-ci-robot authored Sep 22, 2022
2 parents fe55db1 + 17e6fab commit b241f7f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions pkg/cluster/internal/providers/podman/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,13 @@ func isUnknownIPv6FlagError(err error) bool {

func isPoolOverlapError(err error) bool {
rerr := exec.RunErrorForError(err)
return rerr != nil &&
(strings.Contains(string(rerr.Output), "is being used by a network interface") ||
strings.Contains(string(rerr.Output), "is already being used by a cni configuration"))
if rerr == nil {
return false
}
output := string(rerr.Output)
return strings.Contains(output, "is already used on the host or by another config") ||
strings.Contains(output, "is being used by a network interface") ||
strings.Contains(output, "is already being used by a cni configuration")
}

// generateULASubnetFromName generate an IPv6 subnet based on the
Expand Down

0 comments on commit b241f7f

Please sign in to comment.