From b34210aa1c4c5a41988fc7f3fe65d31c146f86d9 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 4 May 2016 16:06:05 +0200 Subject: [PATCH 1/2] *: appc/cni -> containernetworking/cni The project has been moved so internally we simply rename everything. Consumers are recommended to update their vendored version of cni. --- dhcp.md | 2 +- host-local.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dhcp.md b/dhcp.md index 298e96e0..7451c2c8 100644 --- a/dhcp.md +++ b/dhcp.md @@ -3,7 +3,7 @@ ## Overview With dhcp plugin the containers can get an IP allocated by a DHCP server already running on your network. -This can be especially useful with plugin types such as [macvlan](https://github.com/appc/cni/blob/master/Documentation/macvlan.md). +This can be especially useful with plugin types such as [macvlan](https://github.com/containernetworking/cni/blob/master/Documentation/macvlan.md). Because a DHCP lease must be periodically renewed for the duration of container lifetime, a separate daemon is required to be running. The same plugin binary can also be run in the daemon mode. diff --git a/host-local.md b/host-local.md index 35aba355..37446157 100644 --- a/host-local.md +++ b/host-local.md @@ -32,7 +32,7 @@ It stores the state locally on the host filesystem, therefore ensuring uniquenes * `routes` (string, optional): list of routes to add to the container namespace. Each route is a dictionary with "dst" and optional "gw" fields. If "gw" is omitted, value of "gateway" will be used. ## Supported arguments -The following [CNI_ARGS](https://github.com/appc/cni/blob/master/SPEC.md#parameters) are supported: +The following [CNI_ARGS](https://github.com/containernetworking/cni/blob/master/SPEC.md#parameters) are supported: * `ip`: request a specific IP address from the subnet. If it's not available, the plugin will exit with an error From 5de15979c6c870fbe2aa46f860760495f2425e6f Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Tue, 5 Apr 2016 10:50:28 -0700 Subject: [PATCH 2/2] plugins/bridge: add support to set hairpin mode --- bridge.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bridge.md b/bridge.md index bda5ac5c..f9c7f2c4 100644 --- a/bridge.md +++ b/bridge.md @@ -19,6 +19,7 @@ If the bridge is missing, the plugin will create one on first use and, if gatewa "bridge": "mynet0", "isGateway": true, "ipMasq": true, + "hairpinMode": true, "ipam": { "type": "host-local", "subnet": "10.10.0.0/16" @@ -34,4 +35,5 @@ If the bridge is missing, the plugin will create one on first use and, if gatewa * `isGateway` (boolean, optional): assign an IP address to the bridge. Defaults to false. * `ipMasq` (boolean, optional): set up IP Masquerade on the host for traffic originating from this network and destined outside of it. Defaults to false. * `mtu` (integer, optional): explicitly set MTU to the specified value. Defaults to the value chosen by the kernel. +* `hairpinMode` (boolean, optional): set hairpin mode for interfaces on the bridge. Defaults to false. * `ipam` (dictionary, required): IPAM configuration to be used for this network.