Commit Graph

781 Commits

Author SHA1 Message Date
e8bea554c5 Merge pull request #13 from squeed/build-fixes
build: some minor post-repo-split fixes; add fastbuild
2017-06-02 10:23:03 +02:00
43a24515ee build: some minor post-repo-split fixes; add fastbuild 2017-06-01 18:51:46 +02:00
0997c532a1 Merge pull request #1 from squeed/portmap-plugin
iptables-based portmapping plugin
2017-06-01 13:05:29 +01:00
a7aaf0e377 plugins/meta/portmap: add an iptables-based host port mapping plugin 2017-06-01 10:06:28 +02:00
22cda76afb vendor: add mattn/go-shellwords 2017-05-31 19:21:03 +02:00
b47d5b7c0a vendor: add libcni 2017-05-31 18:32:38 +02:00
539174f8c8 vendor: update coreos/go-iptables 2017-05-31 18:32:38 +02:00
8816992fcb Merge pull request #9 from squeed/move-pkg
Move libraries from cni only used by plugins.
2017-05-31 10:11:59 -05:00
4e2f467e21 vendor: remove moved cni/pkg/... libraries 2017-05-23 16:12:53 +02:00
3c436520be move most of cni/pkg to plugins/pkg: delete code staying in cni/pkg
This moves the following packages to this repository:
* ip
* ipam
* ns
* testutils
* utils
2017-05-23 16:12:49 +02:00
8b43e90949 Add 'pkg/' from commit 'a11be4d7596203874b742b6597caf255204c56c3'
git-subtree-dir: pkg
git-subtree-mainline: dcf7368eea
git-subtree-split: a11be4d759
2017-05-19 19:43:02 +02:00
dcf7368eea Merge pull request #6 from squeed/merge-docs
Documentation folder merge
2017-05-19 16:16:01 +02:00
0c1c1b7d8c Merge pull request #8 from squeed/bump-cni
vendor: bump cni to v0.5.2
2017-05-19 15:54:54 +02:00
f5e4c117d1 vendor: bump cni to v0.5.2 2017-05-19 14:38:26 +02:00
c9e3fc4890 Add references to all plugins to the README 2017-05-16 16:46:24 +02:00
9f52fc0374 Move documentation folder to individual READMEs 2017-05-16 16:46:15 +02:00
3ac78df0b6 Add 'Documentation/' from commit '5bb59a12b80dc99552bebf0394a067807f72f947'
git-subtree-dir: Documentation
git-subtree-mainline: db8f94a509
git-subtree-split: 5bb59a12b8
2017-05-15 17:13:31 +02:00
db8f94a509 Rename build & test, take two 2017-05-15 16:50:24 +02:00
1430c43243 Rename build script to avoid conflict with bazel 2017-05-15 16:45:58 +02:00
f130db5b61 Merge pull request #5 from dcbw/add-cni-plugins
plugins: add plugins from containernetworking/cni
2017-05-15 12:27:40 +02:00
d2792f264e plugins: add plugins from containernetworking/cni
Plugins prepared from the containernetworking/cni repo as follows:

1) git reset --hard 1a9288c3c0
2) git remove everything not in plugins/
3) git remove plugins/test
4) git merge into containernetworking/plugins repo
5) adjust import paths for containernetworking/cni -> containernetworking/plugins
2017-05-14 23:12:45 -05:00
4e0349a7e7 Remove everything except for plugins in preparation for import to plugins repo 2017-05-14 23:04:53 -05:00
4af68521cd plugins: move vlan to plugins/main/ 2017-05-09 22:47:26 -05:00
7cab2fd317 vendor: add github.com/d2g 2017-05-09 22:45:44 -05:00
be5f1f723e vendor: add coreos/go-systemd 2017-05-09 22:45:44 -05:00
8c27b64f13 vendor: add gomega/gbytes and gomega/gexec 2017-05-09 22:45:44 -05:00
af9127b7ea vendor: bump CNI to 1a9288c3c0 2017-05-09 22:45:44 -05:00
1a9288c3c0 Merge pull request #450 from gunjan5/spec-version-mismatch
cniVersion and config structure mismatch
2017-05-08 11:12:25 +02:00
e03c76b852 Merge pull request #445 from feiskyer/cniversion
Add cniVersion to Result
2017-05-05 17:47:26 -05:00
efe4f37afa cniVersion and config structure mismatch 2017-05-05 14:50:58 -07:00
c44a76ddd3 Merge pull request #4 from containernetworking/plugins-travis
travis integration
2017-05-05 17:10:19 +02:00
b686cad062 Merge pull request #447 from gunjan5/invalid-spec-json
Fix invalid json
2017-05-04 16:06:04 -07:00
5e3be5a44f fix invalid json 2017-05-04 15:59:11 -07:00
1e3715157c travis integration
- go build instead of go install to support cross-compile to bin dir
- shellcheck fixes for build script
2017-05-03 12:22:14 -07:00
a11be4d759 Fix testings accross the project
Signed-off-by: Pengfei Ni <feiskyer@gmail.com>
2017-05-03 23:21:44 +08:00
f197c01b62 Fix testings accross the project
Signed-off-by: Pengfei Ni <feiskyer@gmail.com>
2017-05-03 23:21:44 +08:00
3cd4e26aeb Add cniVersion to Result
Signed-off-by: Pengfei Ni <feiskyer@gmail.com>
2017-05-03 21:38:42 +08:00
27a5b994c2 Add cniVersion to Result
Signed-off-by: Pengfei Ni <feiskyer@gmail.com>
2017-05-03 21:38:42 +08:00
231f6c4c53 Merge pull request #433 from dunjut/master
scripts: cleanup() should rm net container in docker-run.sh
2017-04-28 20:58:17 -05:00
a6c96acda4 Merge pull request #440 from feiskyer/cap
cnitool: support capablity args
2017-04-28 20:55:31 -05:00
c11286b835 Merge pull request #2 from dcbw/vlan
plugins: add a simple VLAN plugin
2017-04-26 12:54:05 -05:00
010c8a9503 Merge pull request #439 from dnardo/netlink-update
vendor: Update vishvanana/netlink dependency.
2017-04-25 10:24:05 -05:00
73a2d131ee cnitool: support capablity args
Signed-off-by: Pengfei Ni <feiskyer@gmail.com>
2017-04-25 17:35:03 +08:00
21d96393ea Merge pull request #391 from tangle329/master
Validate rangeStart and rangeEnd specified in conf
2017-04-24 22:00:07 -05:00
8eddd61fed Merge pull request #435 from micahhausler/patch-1
Fixed table formatting
2017-04-24 11:21:33 -07:00
0de29de33e Update netlink dependency. 2017-04-24 10:31:24 -07:00
87fbabeeef Fixed table formatting 2017-04-21 15:22:56 -04:00
du
6ee2048ec2 scripts: cleanup() should rm net container in docker-run.sh 2017-04-21 18:27:46 +08:00
279cae5ec5 Merge pull request #432 from dunjut/master
README: build the plugins using ./build.sh, not ./build
2017-04-21 11:12:49 +01:00
du
43c11dda15 README: build the plugins using ./build.sh, not ./build 2017-04-21 15:29:57 +08:00