Do not error out if no ip is available in a prefix #551
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gerrit91
approved these changes
Jul 22, 2024
Gerrit91
reviewed
Jul 22, 2024
majst01
force-pushed
the
do-not-error-if-no-ip-available-in-prefix
branch
from
cb63feb to
7603269
Compare
Gerrit91
reviewed
Jul 24, 2024
| @@ -560,6 +561,12 @@ func (r *networkResource) freeNetwork(request *restful.Request, response *restfu | |||
| for _, prefix := range nw.Prefixes { | |||
| err = r.ipamer.ReleaseChildPrefix(ctx, prefix) | |||
| if err != nil { | |||
| var connectErr *connect.Error | |||
| if errors.As(err, &connectErr) { | |||
There was a problem hiding this comment.
Probably we cannot skip here as then we have orphaned prefixes after freeing the network.
majst01
commented
Jul 24, 2024
| @@ -439,8 +437,11 @@ func allocateSpecificIP(ctx context.Context, parent *metal.Network, specificIP s | |||
| func allocateRandomIP(ctx context.Context, parent *metal.Network, ipamer ipam.IPAMer) (ipAddress, parentPrefixCidr string, err error) { | |||
| for _, prefix := range parent.Prefixes { | |||
| ipAddress, err = ipamer.AllocateIP(ctx, prefix) | |||
| if err != nil && errors.Is(err, goipam.ErrNoIPAvailable) { | |||
| continue | |||
| var connectErr *connect.Error | |||
There was a problem hiding this comment.
check for err != nil is missing here
Gerrit91
reviewed
Jul 24, 2024
| @@ -730,6 +743,12 @@ func (r *networkResource) deleteNetwork(request *restful.Request, response *rest | |||
| for _, p := range nw.Prefixes { | |||
| err := r.ipamer.DeletePrefix(ctx, p) | |||
| if err != nil { | |||
| var connectErr *connect.Error | |||
majst01
force-pushed
the
do-not-error-if-no-ip-available-in-prefix
branch
from
ee1c960 to
c8ca47a
Compare
…o do-not-error-if-no-ip-available-in-prefix
majst01
force-pushed
the
do-not-error-if-no-ip-available-in-prefix
branch
from
c8ca47a to
6889816
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes: #550
Depends on: metal-stack/go-ipam#157