This repository was archived by the owner on Jun 20, 2024. It is now read-only.
Remove 'weave expose' race in CNI plugin #2637
Merged
Conversation
This file contains hidden or 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
rade
reviewed
Nov 10, 2016
| return err | ||
| } | ||
| return nil | ||
| } |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
I am eagerly waiting the #2617 fix. When can I expect an image with the fix to be pushed to Docker Hub? Is it it tied to 1.8.1? |
Contributor
|
This needs to rebase on/target |
Contributor
|
@raghu67 yes, it'll be in the 1.8.1 release. We don't have an ETA on that yet, but it will probably be soon. |
Contributor
Author
|
Retargeted onto 1.8 branch |
awh
reviewed
Nov 11, 2016
prog/weaveutil/expose.go
Outdated
| cmdUsage("expose-nat", "<cidr>...") | ||
| } | ||
|
|
||
| cidrs, err := parseCIDRs(args[1:]) |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
dc9894f to
959d377
Compare
This avoids a race between the plugin and the script
So something waiting for the config (e.g. Kubernetes) doesn't try to talk to Weave before then (this only helps on first install, but that tends to be when things are busiest).
0f0a74c to
f869307
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #2617 and fixes #2570