979 Commits

Author SHA1 Message Date
Tiesheng
54286af90f Update README.md
Highlight bash/shell code in markdown for readability.

Signed-off-by: chengtiesheng <chengtiesheng@huawei.com>
2016-01-06 16:25:02 +08:00
Stefan Junker
4fcf18cb88 Merge pull request #91 from tomdee/patch-1
Fix docker example in README.md
2016-01-05 09:05:09 +01:00
Tom Denham
0a289316d6 Update README.md
No need for full path to ifconfig (and the given path doesn't work...)
2016-01-04 17:06:30 -08:00
Jonathan Boulle
80f87ceb14 Merge pull request #90 from dgonyeo/master
pkg/ip: fix typo in error message, s/iptabes/iptables/
2015-12-16 22:46:05 +01:00
Derek Gonyeo
6b58eda23a pkg/ip: fix typo in error message, s/iptabes/iptables/ 2015-12-16 13:20:19 -08:00
Derek Gonyeo
fd64ee6ade pkg/ip: fix typo in error message, s/iptabes/iptables/ 2015-12-16 13:20:19 -08:00
Eugene Yakubovich
11e121cdd5 Merge pull request #80 from eyakubovich/add-version
spec: add cniVersion to results and config
2015-12-09 13:59:47 -08:00
Eugene Yakubovich
420a145719 spec: add cniVersion to results and config
Version all artifacts using semantic versioning
so that plugins and container runtimes coded against
different versions of the spec can interoperate.

Fixes #44
2015-12-02 13:06:20 -08:00
Stefan Junker
f777ca50e5 Merge pull request #78 from steveeJ/improve-errormsg-missing-subnet
host-local: detect missing subnet and error out
2015-11-30 20:56:25 +01:00
Stefan Junker
753b10503c host-local: detect missing subnet and error out 2015-11-25 21:18:48 +01:00
Eugene Yakubovich
19c18abdb1 Merge pull request #82 from steveeJ/dhcp-linkfix
dhcp: detect if link is down and attempt to set up
2015-11-20 12:18:18 -08:00
Stefan Junker
6f23757868 dhcp: detect if link is down and attempt to set up
With this we still get the "network is down" error, but after the 2nd
retry the interface is up and the dhcp request works.
2015-11-19 11:11:32 +01:00
Eugene Yakubovich
c3388070c3 Merge pull request #76 from eyakubovich/dns
spec: add "dns" field to the result JSON
2015-11-10 16:59:31 -08:00
Eugene Yakubovich
8aeb066a58 spec: add "dns" field to the result JSON
This adds an ability for networks to communicate
about the DNS nameservers they know about to the
container runtime.

Fixes #67
2015-11-10 16:58:01 -08:00
Eugene Yakubovich
442852a861 Merge pull request #73 from eyakubovich/flannel-fix
flannel: doc fix and check for missing subnet.env fields
2015-10-07 18:03:54 -07:00
Eugene Yakubovich
dd719a43ce flannel: doc fix and check for missing subnet.env fields
- Document that flannel outputs FLANNEL_NETWORK b/c we use it
- Check and error out if expecited fields are missing in subnetEnv file

Fixes #72
2015-10-07 15:38:12 -07:00
Eugene Yakubovich
20f1b8694f flannel: doc fix and check for missing subnet.env fields
- Document that flannel outputs FLANNEL_NETWORK b/c we use it
- Check and error out if expecited fields are missing in subnetEnv file

Fixes #72
2015-10-07 15:38:12 -07:00
Michael Bridgen
e727d10746 Merge pull request #71 from jonboulle/master
README/CONTRIBUTING: mention cni-dev@ list
2015-10-05 12:10:56 +01:00
Jonathan Boulle
d3ca177ee4 README/CONTRIBUTING: mention cni-dev@ list 2015-10-01 12:43:43 -07:00
Eugene Yakubovich
f885288a2d Merge pull request #69 from eyakubovich/err-msgs
Route del would fail due to wrong scope; better errors
2015-09-30 11:56:56 -07:00
Eugene Yakubovich
b2b2597506 Merge pull request #70 from eyakubovich/copyright
Change copyright from CoreOS to CNI authors
2015-09-30 11:03:46 -07:00
Eugene Yakubovich
4bee884fae Change copyright from CoreOS to CNI authors
CNI is developed by more than just CoreOS, Inc
and the copyright is retained by all CNI
contributors (for their respective contributed code).
2015-09-29 11:51:33 -07:00
Eugene Yakubovich
0becca2e96 Change copyright from CoreOS to CNI authors
CNI is developed by more than just CoreOS, Inc
and the copyright is retained by all CNI
contributors (for their respective contributed code).
2015-09-29 11:51:33 -07:00
Eugene Yakubovich
5efd3ba883 Route del would fail due to wrong scope; better errors
In some cases the route deletion would fail due to wrong
scope. It should be NOWHERE when deleting (per iproute2).
This also adds more verbose error messages.
2015-09-29 11:27:49 -07:00
Stefan Junker
f0266a2717 Merge pull request #65 from steveeJ/fix-veth-setup
Fix veth setup

Fixes #61 #64
2015-09-24 21:53:54 +02:00
Stefan Junker
4da892a669 link: switch to host netns to set up host veth end 2015-09-24 18:49:27 +02:00
Stefan Junker
5b7aa09e52 link: switch to host netns to set up host veth end 2015-09-24 18:49:27 +02:00
Stefan Junker
8525fef466 Revert "plugins/ptp: allow host veth to be UP"
This reverts commit 231d2d5a27f3ba54219c3f0b1c8ef2c5dab4faaf.
2015-09-24 18:32:18 +02:00
Stefan Junker
f1c9c632e1 Revert "plugins/ptp: allow host veth to be UP"
This reverts commit 231d2d5a27f3ba54219c3f0b1c8ef2c5dab4faaf.
2015-09-24 18:32:18 +02:00
Stefan Junker
39ea97f99d Merge pull request #63 from steveeJ/no-host-local-ptp
Merge host-local and host-local-ptp
2015-09-24 13:10:47 +02:00
Stefan Junker
8d3eb91a37 plugins/ptp: allow host veth to be UP 2015-09-24 10:57:36 +02:00
Stefan Junker
231d2d5a27 plugins/ptp: allow host veth to be UP 2015-09-24 10:57:36 +02:00
Stefan Junker
4c57a90da6 update ptp docs to reflect changes in plugin 2015-09-24 09:43:55 +02:00
Stefan Junker
6737bc8207 update ptp docs to reflect changes in plugin 2015-09-24 09:43:55 +02:00
Eugene Yakubovich
60be55a7d1 remove host-local-ptp plugin 2015-09-23 11:04:38 +02:00
Eugene Yakubovich
7d8d6b2a7e Use single IP on the host for ptp veths
Instead of allocating a /31 for each container,
use the same IP on the host side for all veths.
This is very similar how real point-to-point
devices work (using donor IPs).
2015-09-23 11:04:38 +02:00
Eugene Yakubovich
94be1cfaab revendoring netlink 2015-09-23 11:04:38 +02:00
Michael Bridgen
2a58bd9379 Merge pull request #60 from eyakubovich/fix-plugin-del
bug fix: exec of DEL cmd caused JSON decode error
2015-09-22 16:39:59 +01:00
Eugene Yakubovich
ae3ceedd69 bug fix: exec of DEL cmd caused JSON decode error
When plugin is executed with a DEL command, it does not
print result to stdout unless there is an error. Therefore
it stdout bytes should not be passed to json.Unmarshal.
2015-09-18 10:30:10 -07:00
Eugene Yakubovich
9ea56937d4 bug fix: exec of DEL cmd caused JSON decode error
When plugin is executed with a DEL command, it does not
print result to stdout unless there is an error. Therefore
it stdout bytes should not be passed to json.Unmarshal.
2015-09-18 10:30:10 -07:00
Michael Bridgen
cc918a1aea Merge pull request #59 from squaremo/factor-out-libcni
Factor an API out into a module
2015-09-17 00:06:54 +01:00
Michael Bridgen
09a8148e36 Factor an API out into a module
This takes some of the machinery from CNI and from the rkt networking
code, and turns it into a library that can be linked into go apps.

Included is an example command-line application that uses the library,
called `cnitool`.

Other headline changes:

 * Plugin exec'ing is factored out

The motivation here is to factor out the protocol for invoking
plugins. To that end, a generalisation of the code from api.go and
pkg/plugin/ipam.go goes into pkg/invoke/exec.go.

 * Move argument-handling and conf-loading into public API

The fact that the arguments get turned into an environment for the
plugin is incidental to the API; so, provide a way of supplying them
as a struct or saying "just use the same arguments as I got" (the
latter is for IPAM plugins).
2015-09-16 10:14:39 +01:00
Michael Bridgen
b88f173c43 Factor an API out into a module
This takes some of the machinery from CNI and from the rkt networking
code, and turns it into a library that can be linked into go apps.

Included is an example command-line application that uses the library,
called `cnitool`.

Other headline changes:

 * Plugin exec'ing is factored out

The motivation here is to factor out the protocol for invoking
plugins. To that end, a generalisation of the code from api.go and
pkg/plugin/ipam.go goes into pkg/invoke/exec.go.

 * Move argument-handling and conf-loading into public API

The fact that the arguments get turned into an environment for the
plugin is incidental to the API; so, provide a way of supplying them
as a struct or saying "just use the same arguments as I got" (the
latter is for IPAM plugins).
2015-09-16 10:14:39 +01:00
Stefan Junker
5da5738456 Merge pull request #58 from steveeJ/remove-ipmasq-ifneedbe
ipvlan/macvlan: remove ipMasq related code
2015-09-10 22:08:57 +02:00
Stefan Junker
d896b82816 ipvlan/macvlan: remove ipMasq related code
Luckily the docs haven't mentioned support for ipMasq for both plugins so far.
Even if anyone has attempted to enable the feature in their configuration files it didn't have the desired effect for the network.
2015-09-09 14:16:39 +02:00
Stefan Junker
75657b0aac Merge pull request #57 from eyakubovich/maintainers
Add MAINTAINERS file
2015-09-09 12:05:35 +02:00
Eugene Yakubovich
c4808e616d Add MAINTAINERS file 2015-09-08 15:58:00 -07:00
Jonathan Boulle
06967ea734 Merge pull request #53 from NeilW/master
IPAM plugin: improve error messages
2015-09-08 14:26:11 -07:00
Neil Wilson
104e8b483e plugin/ipam: correct formatting of error message 2015-09-08 18:08:15 +00:00
Neil Wilson
2d0d4b35e1 plugin/ipam: correct formatting of error message 2015-09-08 18:08:15 +00:00