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.

Sign up for GitHub

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

Jump to bottom

Resilient network free. #476

Merged
merged 5 commits into from
Oct 31, 2023
Merged

Resilient network free. #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4efed42
Resilient network free.
Gerrit91 Oct 31, 2023
560940c
Throw out the IP usage validation completely, this is done by go-ipam…
Gerrit91 Oct 31, 2023
2031db7
Add comment.
Gerrit91 Oct 31, 2023
6baf6de
Satisfy linter.
Gerrit91 Oct 31, 2023
4e1d832
Merge remote-tracking branch 'origin/master' into resilient-network-free
Gerrit91 Oct 31, 2023
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
14 changes: 11 additions & 3 deletions cmd/metal-api/internal/ipam/ipam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ipam

import (
"fmt"
"net/netip"

"github.com/metal-stack/metal-api/cmd/metal-api/internal/metal"

Expand Down Expand Up @@ -42,13 +43,20 @@ func (i *Ipam) AllocateChildPrefix(parentPrefix metal.Prefix, childLength uint8)

// ReleaseChildPrefix release a child prefix from a parent prefix in the IPAM.
func (i *Ipam) ReleaseChildPrefix(childPrefix metal.Prefix) error {
ipamChildPrefix := i.ip.PrefixFrom(childPrefix.String())
_, err := netip.ParsePrefix(childPrefix.String())
if err != nil {
return fmt.Errorf("invalid child prefix: %w", err)
}

ipamChildPrefix := i.ip.PrefixFrom(childPrefix.String())
if ipamChildPrefix == nil {
return fmt.Errorf("error finding child prefix in ipam: %s", childPrefix.String())
// FIXME: unfortunately, go-ipam does not return a proper error here so we cannot deduce if the prefix
// was already deleted or not, so if the database is down or something we continue with network deletion
// even though there could be remainings in the go-ipam db
return nil
}

err := i.ip.ReleaseChildPrefix(ipamChildPrefix)
err = i.ip.ReleaseChildPrefix(ipamChildPrefix)
if err != nil {
return fmt.Errorf("error releasing child prefix in ipam: %w", err)
}
Expand Down
16 changes: 1 addition & 15 deletions cmd/metal-api/internal/service/network-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,21 +550,6 @@ func (r *networkResource) freeNetwork(request *restful.Request, response *restfu
return
}

for _, prefix := range nw.Prefixes {
usage, err := r.ipamer.PrefixUsage(prefix.String())
if err != nil {
r.sendError(request, response, defaultError(err))
return
}

if usage.UsedIPs > 2 {
if err != nil {
r.sendError(request, response, defaultError(fmt.Errorf("cannot release child prefix %s because IPs in the prefix are still in use: %v", prefix.String(), usage.UsedIPs-2)))
return
}
}
}

for _, prefix := range nw.Prefixes {
err = r.ipamer.ReleaseChildPrefix(prefix)
if err != nil {
Expand Down Expand Up @@ -767,6 +752,7 @@ func getNetworkUsage(nw *metal.Network, ipamer ipam.IPAMer) *metal.NetworkUsage
for _, prefix := range nw.Prefixes {
u, err := ipamer.PrefixUsage(prefix.String())
if err != nil {
// FIXME: the error should not be swallowed here as this can return wrong usage information to the clients
continue
}
usage.AvailableIPs = usage.AvailableIPs + u.AvailableIPs
Expand Down