Don't advertise blocks with pending affinity #1712
Merged
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
caseydavenport
added
the
release-note-required
caseydavenport
force-pushed
the
advertise-confirmed-blocks
branch
from
a29511f to
e9ddd11
Compare
caseydavenport
force-pushed
the
advertise-confirmed-blocks
branch
from
e9ddd11 to
ae79ed3
Compare
robbrockbank
reviewed
Mar 3, 2018
| @@ -16,7 +16,19 @@ function calico_aggr () | |||
| {{range ls "/"}} | |||
| {{$parts := split . "-"}} | |||
| {{$cidr := join $parts "/"}} | |||
| if ( net = {{$cidr}} ) then { accept; } | |||
| if ( net ~ {{$cidr}} ) then { reject; } | |||
| {{$affinity := json (getv (printf "/%s" .))}} | |||
There was a problem hiding this comment.
can you change to use range gets and json .Value here, so something like:
{{range gets "/"}}
{{$parts := split .Key "-"}}
{{$cidr := join $parts "/"}}
{{$affinity := json .Value}}
|
@robbrockbank thanks, check out the new stuff :) |
robbrockbank
approved these changes
Mar 6, 2018
3 tasks
3 tasks
|
Revert for second broken commit here: #1752 |
caseydavenport
added
cherry-pick-completed
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.
Description
In conjunction with projectcalico/libcalico-go#785, this change will make sure that any leaked block affinities won't get advertised by BIRD during the interim before they are cleaned up.
Todos
Release Note