This repository has been archived by the owner on Jul 1, 2023. It is now read-only.
Update fork with upstream fixes/changes #11
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
systemd 242+ assigns MAC addresses for all virtual devices which don't have the address assigned already. That resulted in systemd overriding MAC addresses of flannel.* interfaces. The fix which prevents systemd from setting the address is to define the concrete MAC address when creating the link. Fixes: flannel-io#1155 Ref: k3s-io/k3s#4188 Signed-off-by: Michal Rostecki <[email protected]> (cherry picked from commit 0198d5d)
Currently flannel interface ip addresses are checked on startup when using vxlan and ipip backends. If multiple addresses are found, startup fails fatally. If only one address is found and is not the currently leased one, it will be assumed that it comes from a previous lease and be removed. This criteria seems arbitrary both in how it is done and in its timing. It may cause failures in situations where it might not be strictly necessary like for example if the node is running a dhcp client that is assigning link local addresses to all interfaces. It also might fail at flannel unexpected restarts which are completly unrelated to the external event that caused the unexpected modification in the flannel interface. This patch proposes to concern and check only ip address within the flannel network and takes the simple approach to ignore any other ip addresses assuming these would pose no problem on flannel operation. A discarded but more agressive alternative would be to remove all addresses that are not the currently leased one. Fixes flannel-io#1060 Signed-off-by: Jaime Caamaño Ruiz <[email protected]> (cherry picked from commit 33a2fac)
(cherry picked from commit 78035d0)
This PR fixs an issue when flannel gets illegal subnet event in watching leases, it doesn't move forward the etcd cursor and will stuck in the same invalid event forever. (cherry picked from commit 1a1b6f1)
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 25, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/planet
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Jan 26, 2022
4 tasks
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Jan 26, 2022
4 tasks
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Jan 26, 2022
4 tasks
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Jan 26, 2022
4 tasks
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Jan 26, 2022
4 tasks
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Jan 26, 2022
knisbet
pushed a commit
to gravitational/gravity
that referenced
this pull request
Feb 1, 2022
* update flannel fork: gravitational/flannel#11 * Revert go 1.17.5 changes in Planet gravitational/planet#880 Co-authored-by: Bernard Kim <[email protected]>
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.
Pulls in upstream changes from:
Also tweaks / fixes