Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with upstream v0.8.7 #36

Merged
merged 62 commits into from Oct 13, 2020
Merged

Sync with upstream v0.8.7 #36

merged 62 commits into from Oct 13, 2020

Commits on Jan 24, 2020

  1. loopback: Fix ipv6 address checks

    Signed-off-by: Onur Filiz <ofiliz@users.noreply.github.com>
    ofiliz committed Jan 24, 2020
    Copy the full SHA
    d1360b8 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2020

  1. Merge pull request #442 from ofiliz/loopback-fix

    loopback: Fix ipv6 address checks
    jellonek committed Jan 27, 2020
    Copy the full SHA
    832f269 View commit details
    Browse the repository at this point in the history
  2. pkg/utils: sysctl package should use black-box testing

    Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
    mars1024 committed Jan 27, 2020
    Copy the full SHA
    37207f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2020

  1. pkg/ip: use type cast instead of untrusty error message

    Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
    mars1024 committed Jan 29, 2020
    Copy the full SHA
    2ff84a4 View commit details
    Browse the repository at this point in the history
  2. ptp: remove some redundant lines

    Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
    mars1024 committed Jan 29, 2020
    Copy the full SHA
    45fd949 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #445 from mars1024/bugfix/link_del

    pkg/ip: use type cast instead of untrusty error message
    dcbw committed Jan 29, 2020
    Copy the full SHA
    66e0aaf View commit details
    Browse the repository at this point in the history
  4. Merge pull request #444 from mars1024/bugfix/ptp_redundant

    ptp: remove some redundant lines
    dcbw committed Jan 29, 2020
    Copy the full SHA
    8bf6a7b View commit details
    Browse the repository at this point in the history
  5. Merge pull request #443 from mars1024/bugfix/black_box_test

    pkg/utils: sysctl package should use black-box testing
    jellonek committed Jan 29, 2020
    Copy the full SHA
    f5c3d1b View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. Make host-device to work with virtio net device

    In case pciBusID contains pci address of the virtio device,
    then lookup the net directory under virtio<id> directory.
    
    Issue: containernetworking/plugins#320
    
    Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@est.tech>
    pperiyasamy committed Feb 11, 2020
    Copy the full SHA
    a9b4e04 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. Merge pull request #453 from Nordix/nfvi_virtio

    Make host-device to work with virtio net device
    jellonek committed Feb 18, 2020
    Copy the full SHA
    5c51219 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2020

  1. flannel: remove net conf file after DEL succeed

    Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
    mars1024 committed Feb 19, 2020
    Copy the full SHA
    53854dd View commit details
    Browse the repository at this point in the history
  2. owners: updates for maintainer changes

    Add Michael Cambria per containernetworking/cni#751
    Remove Stefan Junker per personal request
    Update Casey's email to @redhat.com
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    dcbw committed Feb 19, 2020
    Copy the full SHA
    c7e2cf7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #454 from dcbw/update-coreos-owners

    owners: updates for maintainer changes
    jellonek committed Feb 19, 2020
    Copy the full SHA
    32fc3ee View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2020

  1. Unlock OS thread after netns is restored

    The current ns package code is very careful about not leaving the calling
    thread with the overridden namespace set, for example when origns.Set() fails.
    This is achieved by starting a new green thread, locking its OS thread, and
    never unlocking it. Which makes golang runtime to scrap the OS thread backing
    the green thread after the go routine exits.
    
    While this works, it's probably not as optimal: stopping and starting a new OS
    thread is expensive and may be avoided if we unlock the thread after resetting
    network namespace to the original. On the other hand, if resetting fails, it's
    better to leave the thread locked and die.
    
    While it won't work in all cases, we can still make an attempt to reuse the OS
    thread when resetting the namespace succeeds. This can be achieved by unlocking
    the thread conditionally to the namespace reset success.
    
    Signed-off-by: Ihar Hrachyshka <ihrachys@redhat.com>
    booxter committed Feb 20, 2020
    Copy the full SHA
    112288e View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

  1. Merge pull request #455 from booxter/master

    Unlock OS thread after netns is restored
    mccv1r0 committed Mar 4, 2020
    Copy the full SHA
    47a9fd8 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. modify the error url of windowscontainer

    Signed-off-by: root <timyinshi>
    jellonek authored and root committed Mar 5, 2020
    Copy the full SHA
    ca41907 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2020

  1. build error utility package to replace juju/errors

    Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
    mars1024 committed Mar 11, 2020
    Copy the full SHA
    8a0e3fe View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. [DO NOT REVIEW] vendor upate to remove useless dependencies

    Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
    mars1024 committed Mar 17, 2020
    Copy the full SHA
    486ef96 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Merge pull request #458 from mars1024/remove/jujuerrors

    replace juju/errors because of CNCF license scan
    squeed committed Apr 1, 2020
    Copy the full SHA
    117e30f View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Reset the route flag before moving the rule

    Signed-off-by: ahenan <ahenan00@gmail.com>
    ahenan authored and ahenan committed Apr 6, 2020
    Copy the full SHA
    2a48d68 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. check bridge's port state

    fix #463
    link host veth pair to bridge, the Initial state
    of port is BR_STATE_DISABLED and change to
    BR_STATE_FORWARDING async.
    
    Signed-off-by: honglichang <honglichang@tencent.com>
    hongli-my committed Apr 8, 2020
    Copy the full SHA
    30776ff View commit details
    Browse the repository at this point in the history
  2. Merge pull request #472 from ahenan/master

    Reset the route flag before moving the rule
    squeed committed Apr 8, 2020
    Copy the full SHA
    ed16760 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #468 from hongli-my/fix-port-state

    check bridge's port state
    mccv1r0 committed Apr 8, 2020
    Copy the full SHA
    f4332fe View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. win-bridge: add support for portMappings capability

    If the pluging receives portMappings in runtimeConfig, the pluing will add a NAT policy for each port mapping on the generated endpoints.
    It enables HostPort usage on Windows with win-bridge.
    
    Signed-off-by: Vincent Boulineau <vincent.boulineau@datadoghq.com>
    vboulineau committed Apr 15, 2020
    Copy the full SHA
    2d2583e View commit details
    Browse the repository at this point in the history
  2. Support device id in host device plugin (#471)

    * Add support for `deviceID` runtime config attribute
    
    Signed-off-by: Adrian Chiris <adrianc@mellanox.com>
    adrianchiris committed Apr 15, 2020
    Copy the full SHA
    a78853f View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. portmap: Apply the DNAT hairpin to the whole subnet

    The DNAT hairpin rule only allow the container itself to access the
    ports it is exposing thru the host IP. Other containers in the same
    subnet might also want to access this service via the host IP, so
    apply this rule to the whole subnet instead of just for the container.
    
    This is particularly useful with setups using a reverse proxy for
    https. With such a setup connections between containers (for ex.
    oauth2) have to downgrade to http, or need complex dns setup to make
    use of the internal IP of the reverse proxy. On the other hand going
    thru the host IP is easy as that is probably what the service name
    already resolve to.
    
    Signed-off-by: Alban Bedel <albeu@free.fr>
    --
    v2: Fixed the tests
    v3: Updated iptables rules documentation in README.md
    v4: Fixed the network addresses in README.md to match iptables output
    AlbanBedel committed Apr 17, 2020
    Copy the full SHA
    5e0fbd8 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Merge pull request #475 from vboulineau/vboulineau/hostport_windows

    win-bridge: add support for portMappings capability
    squeed committed Apr 22, 2020
    Copy the full SHA
    44d92c1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #469 from AlbanBedel/portmap-hairpin-subnet

    portmap: Apply the DNAT hairpin to the whole subnet
    jellonek committed Apr 22, 2020
    Copy the full SHA
    5af9ff4 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. plugins/meta/sbr: Adjusted ipv6 address mask to /128

    A /64 mask was used which routed an entire cidr based on source,
    not only the bound address.
    
    Fixes #478
    
    Signed-off-by: Lars Ekman <lars.g.ekman@est.tech>
    Lars Ekman committed Apr 28, 2020
    Copy the full SHA
    02bfece View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2020

  1. Merge pull request #479 from Nordix/issue-478

    plugins/meta/sbr: Adjusted ipv6 address mask to /128
    jellonek committed Apr 29, 2020
    Copy the full SHA
    6957f6c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #460 from timyinshi/windowcontainer-new

    modify the error url of windowscontainer
    bboreham committed Apr 29, 2020
    Copy the full SHA
    f7a2fc9 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. ptp, bridge: disable accept_ra on the host-side interface

    The interface plugins should have absolute control over their addressing
    and routing.
    
    Signed-off-by: Casey Callendrello <cdc@redhat.com>
    squeed committed May 12, 2020
    Copy the full SHA
    219eb9e View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. Merge pull request #484 from squeed/disable-ra

    ptp, bridge: disable accept_ra on the host-side interface
    jellonek committed May 13, 2020
    Copy the full SHA
    ad10b6f View commit details
    Browse the repository at this point in the history

Commits on May 17, 2020

  1. host-device: Bring interfaces down before moving.

    When trying to move a master and slave interface into a container it is not
    possible without first bringing the interfaces down. This change ensures
    that the interface is set to down prior to trying to move the interface
    into the container. This matches the behaviour on moving an interface out
    of the container.
    
    Signed-off-by: cns <christopher.swindle@metaswitch.com>
    cswindle committed May 17, 2020
    Copy the full SHA
    79192cb View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. macvlan: set mac address from CNI_ARGS

    This change sets the mac address if specified during the creation of the
    macvlan interface. This is superior to setting it via the tuning plugin
    because this ensures the mac address is set before an IP is set,
    allowing a container to get a reserved IP address from DHCP.
    
    Related #450
    
    Signed-off-by: Clint Armstrong <clint@clintarmstrong.net>
    clinta committed May 20, 2020
    Copy the full SHA
    b9560fd View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. Merge pull request #480 from clinta/macvlan-mac

    macvlan: set mac address from args
    squeed committed May 27, 2020
    Copy the full SHA
    6717560 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #486 from Metaswitch/bring-down-interfaces

    host-device: Bring interfaces down before moving.
    squeed committed May 27, 2020
    Copy the full SHA
    b76fdd7 View commit details
    Browse the repository at this point in the history
  3. portmap: don't use unspecified address as destination

    It may happen that you want to map a port only in one IP family.
    It can be achieved using the unspecified IP address of the
    corresponding IP family as HostIP i.e.:
    
    podman run --rm --name some-nginx -d -p 0.0.0.0:8080:80 nginx
    
    The problem is that current implementation considers the
    unspecified address valid and appends it to the iptables rule:
    
    -A CNI-DN-60380cb3197c5457ed6ba -s 10.88.0.0/16
    -d 0.0.0.0/32 -p tcp -m tcp --dport 8080 -j CNI-HOSTPORT-SETMARK
    
    This rule is not forwarding the traffic to the mapped port.
    
    We should use the unspecified address only to discriminate the IP
    family of the port mapping, but not use it to filter the dst.
    
    Signed-off-by: Antonio Ojea <antonio.ojea.garcia@gmail.com>
    aojea committed May 27, 2020
    Copy the full SHA
    5cb3a5e View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. Merge pull request #487 from aojea/pmapHostIp

    portmap: don't use unspecified address as iptables rule destination
    squeed committed Jun 3, 2020
    Copy the full SHA
    1fb9793 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2020

  1. Update README.md

    Updated "Notes" for minor fixes.
    ashish-billore committed Jun 19, 2020
    Copy the full SHA
    68a80bc View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2020

  1. Merge pull request #503 from ashish-billore/master

    Update README.md
    squeed committed Jun 24, 2020
    Copy the full SHA
    e1f8f9b View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Fix handling of delay in acquiring lease with stp turned on

    Signed-off-by: Aneesh Puttur <aneeshputtur@gmail.com>
    aneeshkp committed Jun 29, 2020
    Copy the full SHA
    d4775ec View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2020

  1. firewall: fix generate of admin chain comment

    Signed-off-by: Dan Williams <dcbw@redhat.com>
    dcbw committed Jul 1, 2020
    Copy the full SHA
    2bd04cb View commit details
    Browse the repository at this point in the history
  2. Merge pull request #501 from aneeshkp/dhcp-timeout

    Fix handling of delay in acquiring lease with stp turned on
    bboreham committed Jul 1, 2020
    Copy the full SHA
    28773dc View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. Merge pull request #506 from dcbw/fw-admin-chain-comment

    firewall: fix generate of admin chain comment
    dcbw committed Jul 8, 2020
    Copy the full SHA
    c90b165 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. portmap DEL noop if no portMappings present

    if the runtime is not passing portMappings in the runtimeConfig,
    then DEL is a noop.
    
    This solves performance issues, when the portmap plugin is
    executed multiple times, holding the iptables lock, despite
    it does not have anything to delete.
    
    Signed-off-by: Antonio Ojea <aojea@redhat.com>
    Antonio Ojea committed Jul 13, 2020
    Copy the full SHA
    877602d View commit details
    Browse the repository at this point in the history
  2. Update firewall README.md

    Document `CNI-ADMIN` chain usage as well as `iptablesAdminChainName`
    
    Signed-off-by: Sameer Vohra <vohra.sam@gmail.com>
    xtreme-sameer-vohra committed Jul 13, 2020
    Copy the full SHA
    051452c View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. Merge pull request #509 from aojea/portmapDel

    portmap should not perform deletions if not portMapping config received
    bboreham committed Jul 15, 2020
    Copy the full SHA
    6eb8e31 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. firewall: fix some typos in docs

    Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
    mars1024 committed Jul 22, 2020
    Copy the full SHA
    813f541 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #513 from mars1024/firewall_docs

    firewall: fix some typos in docs
    dcbw committed Jul 22, 2020
    Copy the full SHA
    d713ec6 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Update firewall README.md CNI-ADMIN

    Signed-off-by: Sameer Vohra <vohra.sam@gmail.com>
    xtreme-sameer-vohra committed Aug 4, 2020
    Copy the full SHA
    0214625 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Merge pull request #505 from xtreme-sameer-vohra/patch-1

    Update firewall README.md
    dcbw committed Aug 5, 2020
    Copy the full SHA
    3aadb40 View commit details
    Browse the repository at this point in the history
  2. Add contact info

    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Aug 5, 2020
    Copy the full SHA
    2b6cd54 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    8a88f90 View commit details
    Browse the repository at this point in the history
  4. Bump Go version to 1.13 and 1.14

    Signed-off-by: Dan Williams <dcbw@redhat.com>
    dcbw committed Aug 5, 2020
    Copy the full SHA
    01a8de9 View commit details
    Browse the repository at this point in the history
  5. cni: bump to 0.8.0

    Signed-off-by: Dan Williams <dcbw@redhat.com>
    dcbw committed Aug 5, 2020
    Copy the full SHA
    c50490e View commit details
    Browse the repository at this point in the history
  6. lo: CNI_IFNAME is no longer ignored

    {
        "code": 4,
        "msg": "interface name contains / or : or whitespace characters"
    }
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    dcbw committed Aug 5, 2020
    Copy the full SHA
    839d918 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #521 from dcbw/go-113

    Bump Go version to 1.13 and 1.14
    dcbw committed Aug 5, 2020
    Copy the full SHA
    bd58999 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2020

  1. Fix race condition in GetCurrentNS

    In GetCurrentNS, If there is a context-switch between
    getCurrentThreadNetNSPath and GetNS, another goroutine may execute in
    the original thread and change its network namespace, then the original
    goroutine would get the updated network namespace, which could lead to
    unexpected behavior, especially when GetCurrentNS is used to get the
    host network namespace in netNS.Do.
    
    The added test has a chance to reproduce it with "-count=50".
    
    The patch fixes it by locking the thread in GetCurrentNS.
    
    Signed-off-by: Quan Tian <qtian@vmware.com>
    tnqn committed Aug 21, 2020
    Copy the full SHA
    799d3cb View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2020

  1. Merge pull request #523 from tnqn/ns-race

    Fix race condition in GetCurrentNS
    squeed committed Aug 26, 2020
    Copy the full SHA
    dacb671 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #449 from mars1024/bugfix/flannel_clean

    flannel: remove net conf file after DEL succeed
    dcbw committed Aug 26, 2020
    Copy the full SHA
    9b8de6a View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. Copy the full SHA
    66b92f5 View commit details
    Browse the repository at this point in the history