Skip to content
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
merged 6 commits into from
Jan 25, 2022
Merged

Commits on Jan 24, 2022

  1. vxlan: Generate MAC address before creating a link

    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)
    vadorovsky authored and Kevin Nisbet committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    c419d06 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2022

  1. Concern only about flannel ip addresses

    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)
    jcaamano authored and Kevin Nisbet committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    29e5672 View commit details
    Browse the repository at this point in the history
  2. Fix flannel hang if lease expired

    (cherry picked from commit 78035d0)
    chenchun authored and Kevin Nisbet committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    c520613 View commit details
    Browse the repository at this point in the history
  3. subnets: move forward the cursor to skip illegal subnet

    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)
    Sen666666 authored and Kevin Nisbet committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    c7d64ee View commit details
    Browse the repository at this point in the history
  4. fix cherry-pick glitches and test failures

    Kevin Nisbet committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    6484a15 View commit details
    Browse the repository at this point in the history
  5. disable udp backend tests since we don't actually have the udp backen…

    …d in our fork
    Kevin Nisbet committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    bac2b80 View commit details
    Browse the repository at this point in the history