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.
so there are going to be some conflicts to resolve with this, I based this off of the 2.5.1 tag.
We needed the CNI support that was dropped into the 3.0 release, but are running 2.5.1. I cherry picked the commit into 2.5.1, built it and deployed and am now able to get my docker container jobs running on our weave network.
Not really sure how you want to handle the merge conflicts, but thought this would be useful to others and am willing to do some work to get it upstream.
thanks,
Eric