Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libovsdb: fix potential duplicate addresses #2763

Merged
merged 1 commit into from
May 6, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/ovs/ovn-nb-address_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ func (c *ovnClient) AddressSetUpdateAddress(asName string, addresses ...string)
return fmt.Errorf("get address set %s: %v", asName, err)
}

// update will failed when slice contains duplicate elements
addresses = util.UniqString(addresses)

// format CIDR to keep addresses the same in both nb and sb
for i, addr := range addresses {
if strings.ContainsRune(addr, '/') {
Expand All @@ -69,6 +66,10 @@ func (c *ovnClient) AddressSetUpdateAddress(asName string, addresses ...string)
addresses[i] = ipNet.String()
}
}

// update will failed when slice contains duplicate elements
addresses = util.UniqString(addresses)

// clear addresses when addresses is empty
as.Addresses = addresses

Expand Down