216 Commits

Author SHA1 Message Date
Iago López Galeiras
6aa26f9fd2 plugins/bridge: clean masquerading rules
In the Add command we set up masquerading rules that didn't have a
corresponding clean-up code in Del.

Add the clean-up code.
2016-05-03 12:21:58 +02:00
Michael Bridgen
cae660409f Merge pull request #189 from tomdee/patch-2
Remove reference to policy on accepting PRs
2016-04-27 15:47:42 +01:00
Tom Denham
902ee8b992 Remove reference to policy on accepting PRs
There is to policy
2016-04-22 12:52:28 -07:00
Stefan Junker
911d941794 Merge pull request #187 from appc/v0.3.0
merge unneeded branch v0.3.0 into master
2016-04-22 19:25:54 +02:00
Michael Bridgen
8bb41b9d6f Merge pull request #186 from steveeJ/project-clarification
README: clarify what CNI is
2016-04-21 11:54:52 +01:00
Stefan Junker
ef251cc6ce README: clarify what CNI is
The word "standard" does not represent what CNI is actually trying to
be.
2016-04-20 20:00:50 +02:00
Zach Gershman
57b28f3936 Merge pull request #182 from rosenhouse/document-lockosthread
Document use of goroutine and LockOSThread in test helpers
2016-04-18 10:45:46 -07:00
Zach Gershman
7383809048 Merge pull request #176 from dcbw/ns-test-fix
ns: fix reading net namespace in multi-threaded processes
2016-04-18 10:44:08 -07:00
Dan Williams
07a993dc7d ns: fix reading net namespace in multi-threaded processes
/proc/self/ns/net gives the main thread's namespace, not necessarily
the namespace of the thread that's running the testcases.  This causes
sporadic failures of the tests.

For example, with a testcase reading inodes after switching netns:

/proc/27686/task/27689/ns/net 4026532565
/proc/self/ns/net 4026531969
/proc/27686/task/27689/ns/net 4026532565

See also:
008d17ae00

Running Suite: pkg/ns Suite
===========================
Random Seed: 1459953577
Will run 6 of 6 specs

• Failure [0.028 seconds]
Linux namespace operations
/cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:167
  WithNetNS
  /cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:166
    executes the callback within the target network namespace [It]
    /cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:97

    Expected
        <uint64>: 4026531969
    to equal
        <uint64>: 4026532565

    /cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:96
------------------------------
•••••

Summarizing 1 Failure:

[Fail] Linux namespace operations WithNetNS [It] executes the callback within the target network namespace
/cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:96

Ran 6 of 6 Specs in 0.564 seconds
FAIL! -- 5 Passed | 1 Failed | 0 Pending | 0 Skipped --- FAIL: TestNs (0.56s)
FAIL
2016-04-18 10:35:23 -05:00
Gabe Rosenhouse
94c4b25698 Document use of goroutine and lockosthread in test helpers 2016-04-17 20:27:02 -07:00
Zach Gershman
616702bcf3 Merge pull request #181 from rosenhouse/testhelpers-extraction
Extract and improve test helpers
2016-04-17 20:20:43 -07:00
Gabe Rosenhouse
e3fb7ce3a7 Fix issues with MakeNetworkNS test helper 2016-04-17 19:47:54 -07:00
Gabe Rosenhouse
dd3b85c9cc Add basic unit tests of testhelpers 2016-04-17 19:25:39 -07:00
Gabe Rosenhouse
54d7f73092 Extract inode inspection functions into testhelpers 2016-04-17 18:35:49 -07:00
Gabe Rosenhouse
5d932e4716 Extract testhelpers from loopback test suite 2016-04-17 18:28:10 -07:00
Michael Bridgen
9a2801085b Merge pull request #180 from philips/add-more-intro
README: add some more introductory material
2016-04-11 10:12:22 +01:00
Brandon Philips
4c778a63a7 README: add some material on what CNI isn't
We get some questions about this stuff from time to time and I want to
acknowledge we have thought about them but aren't currently tackling
them.
2016-04-10 18:23:06 -07:00
Brandon Philips
d5a8ec9029 README: add some more details on what CNI is
We needed a bit more intro material to scope what CNI does. Here is my
attempt.
2016-04-10 18:22:38 -07:00
Stefan Junker
41ee449fb2 Merge pull request #177 from steveeJ/macvlan-arp-proxy
Macvlan arp proxy
2016-04-08 14:53:48 +02:00
Stefan Junker
a06a464235 Merge pull request #178 from steveeJ/master
travis: don't go get vet
2016-04-08 14:35:58 +02:00
Stefan Junker
27d37cbdf1 travis: don't go get vet 2016-04-08 14:29:04 +02:00
Stefan Junker
bc482febfb travis: don't go get vet 2016-04-08 14:22:20 +02:00
Piotr Skamruk
b2f492e8b5 macvlan: set proxy_arp in time of creating interface
Resolves CNI part of https://github.com/coreos/rkt/issues/1765
Second part would be adding similar lines into kvm flavored macvlan
support (in time of creating macvtap device).
2016-04-07 21:40:58 +02:00
Piotr Skamruk
72bec92851 pkg/utils: add functions to work with sysctl 2016-04-07 21:40:51 +02:00
Stefan Junker
a15a372021 Merge pull request #173 from jonboulle/master
*: add missing license headers + check
2016-04-02 15:22:40 +02:00
Jonathan Boulle
f6135c7ba3 *: add missing license headers + check 2016-04-01 15:35:21 +02:00
Michael Bridgen
0046767be7 Merge pull request #172 from squaremo/readme_more
Readme improvements
v0.2.0-rc0
2016-04-01 13:23:28 +01:00
Michael Bridgen
fcbde68d32 docs: add brief section on contributing, to README 2016-04-01 12:51:39 +01:00
Michael Bridgen
8c860a832f docs: cosmetic edits to README.md 2016-04-01 12:37:39 +01:00
Stefan Junker
42c4cb842d Merge pull request #168 from steveeJ/chain-len
attempt to ensure chain name is unique and at most 29 chars long
2016-03-31 19:25:13 +02:00
Stefan Junker
897766d74b pkg/utils: correct the test's expected chain names 2016-03-31 18:01:32 +02:00
Stefan Junker
6aad63055c *: add comment to iptables rules for ipmasq 2016-03-31 18:01:32 +02:00
Stefan Junker
bcef17daac pkg/utils: remove unneeded condition in tests 2016-03-31 18:01:32 +02:00
Stefan Junker
77759626a8 pkg/utils: fix docstring 2016-03-31 18:01:32 +02:00
Stefan Junker
53d9cee00a pkg/utils: split and unexport constants 2016-03-31 18:01:32 +02:00
Stefan Junker
bc44d1227d pkg/utils: fix docstring 2016-03-31 18:01:32 +02:00
Stefan Junker
3e6069cab5 pkg/utils: use constant for chain prefix 2016-03-31 18:01:32 +02:00
Stefan Junker
09248dfad9 pkg/utils: use name+id for hash and extend tests 2016-03-31 18:01:32 +02:00
Abhishek Chanda
c33daf6706 pkg: add a function to generate chain names
Adds a function to generate chain names for use in iptables and
ports all drivers to use that function. Also adds tests for the
said function.
2016-03-31 18:01:32 +02:00
Zach Gershman
bacaa11d2d Merge pull request #171 from steveeJ/bump-cni
vendoring: bump coreos/go-iptables to 0.1.0
2016-03-31 08:46:55 -07:00
Stefan Junker
88d974c562 vendoring: bump coreos/go-iptables to 0.1.0 2016-03-31 17:33:50 +02:00
Michael Bridgen
5362e90c8a Merge pull request #170 from jonboulle/master
README: add Calico and Weave as CNI users
2016-03-31 14:51:30 +01:00
Jonathan Boulle
77a5bf44f4 README: add Calico and Weave as CNI users 2016-03-31 15:44:03 +02:00
Stefan Junker
1e0e105b36 Merge pull request #169 from philips/add-users
README: add a list of CNI users
2016-03-31 10:21:13 +02:00
Brandon Philips
0b4f7d849f README: add a list of CNI users 2016-03-30 15:59:16 -07:00
Zach Gershman
4146443942 Merge pull request #165 from dcbw/go15-vendor
scripts: fix build with go-1.5 after switch to vendor/
2016-03-24 10:44:00 -07:00
Dan Williams
ae2f64ec40 scripts: fix build with go-1.5 after switch to vendor/
go-1.6 enables vendor by default, but go-1.5 needs an environment variable.
2016-03-24 11:33:19 -05:00
Zach Gershman
5c79f8bd5d Merge pull request #158 from steveeJ/loadargs
Add generic IgnoreUnknown to valid CNI_ARGS
2016-03-22 22:05:57 -07:00
Stefan Junker
8916a7ea5f pkg/types: add tests for args 2016-03-21 20:40:39 +01:00
Stefan Junker
b91aec9a62 Godeps: bump ginkgo for table extensions 2016-03-21 20:36:05 +01:00