979 Commits

Author SHA1 Message Date
Tang Le
1003822e53 Check n.IPAM before use it in LoadIPAMConfig function
Signed-off-by: Tang Le <tangle3@wanda.cn>
2017-03-02 10:25:19 +08:00
Dan Williams
9b8a0e0c64 spec,libcni: add support for injecting runtimeConfig into plugin stdin data
Add a new CapabilityArgs member to the RuntimeConf struct which runtimes can
use to pass arbitrary capability-based keys to the plugin.  Elements of this
member will be filtered against the plugin's advertised capabilities (from
its config JSON) and then added to a new "runtimeConfig" top-level map added
to the config JSON sent to the plugin on stdin.

Also "runtime_config"->"runtimeConfig" in CONVENTIONS.md to make
capitalization consistent with other CNI config keys like "cniVersion".
2017-03-01 10:49:40 -06:00
Dan Williams
71c4a60741 spec,libcni: add support for injecting runtimeConfig into plugin stdin data
Add a new CapabilityArgs member to the RuntimeConf struct which runtimes can
use to pass arbitrary capability-based keys to the plugin.  Elements of this
member will be filtered against the plugin's advertised capabilities (from
its config JSON) and then added to a new "runtimeConfig" top-level map added
to the config JSON sent to the plugin on stdin.

Also "runtime_config"->"runtimeConfig" in CONVENTIONS.md to make
capitalization consistent with other CNI config keys like "cniVersion".
2017-03-01 10:49:40 -06:00
Tom Denham
6008de1ffd Merge pull request #382 from rosenhouse/doc-spec-upgrade
Documentation: guidance for upgrading to CNI Spec v0.3.0
2017-03-01 08:45:56 -08:00
Casey Callendrello
c806f3d62b Minor rewording about default config version 2017-02-28 19:44:25 +01:00
Casey Callendrello
09e5feae1f Minor rewording about default config version 2017-02-28 19:44:25 +01:00
Dan Williams
0b1b85413e Merge pull request #383 from dcbw/test-fixes
tests: misc test fixes
2017-02-27 16:13:45 -06:00
Dan Williams
7d8c23dd59 Merge pull request #383 from dcbw/test-fixes
tests: misc test fixes
2017-02-27 16:13:45 -06:00
Dan Williams
d6d012b88f Merge pull request #374 from squeed/config-list-upconvert
libcni: up-convert a Config to a ConfigList when no other configs are found.
2017-02-27 15:10:37 -06:00
Dan Williams
1f4a8c2802 Merge pull request #377 from squeed/ptp-sandbox
plugins/main/ptp: set the Sandbox property on the response
2017-02-27 15:06:57 -06:00
Dan Williams
fc174a6635 Merge pull request #380 from bboreham/patch-1
Add Bryan Boreham as maintainer
2017-02-27 15:06:26 -06:00
Dan Williams
2f1bfcee63 pkg/types: misc current types testcase cleanups 2017-02-27 13:28:07 -06:00
Dan Williams
35153e7de8 pkg/types: misc current types testcase cleanups 2017-02-27 13:28:07 -06:00
Dan Williams
2a6d12b206 pkg/testutils: return errors after restoring stdout
Ensures Ginkgo is able to print detailed failure messages instead
of them being captured by the pipe.
2017-02-27 13:27:19 -06:00
Dan Williams
5a984f0dee pkg/testutils: return errors after restoring stdout
Ensures Ginkgo is able to print detailed failure messages instead
of them being captured by the pipe.
2017-02-27 13:27:19 -06:00
Dan Williams
94e02e0768 Merge pull request #375 from aaithal/complieOnNonLinuxPlatforms
pkg/ns: refactored so that builds succeed on non-linux platforms
2017-02-27 11:46:22 -06:00
Gabe Rosenhouse
f15d521b2a docs: table formatting is hard 2017-02-27 07:57:00 -08:00
Gabe Rosenhouse
bbc23ea761 docs: table formatting is hard 2017-02-27 07:57:00 -08:00
Gabe Rosenhouse
5124ac4759 docs: fill-out and correct version conversion table 2017-02-27 07:53:09 -08:00
Gabe Rosenhouse
b6e9bf8372 docs: fill-out and correct version conversion table 2017-02-27 07:53:09 -08:00
Gabe Rosenhouse
2aa863dab7 docs: minor improvements to spec-upgrades 2017-02-27 07:17:37 -08:00
Gabe Rosenhouse
379d47760c docs: minor improvements to spec-upgrades 2017-02-27 07:17:37 -08:00
Casey Callendrello
1061ef1eb9 docs: add small upgrade instructions 2017-02-27 14:57:31 +01:00
Casey Callendrello
119d6f20f5 docs: add small upgrade instructions 2017-02-27 14:57:31 +01:00
Casey Callendrello
bdd70561ad docs: minor improvements to 0.3.0 upgrade guidance 2017-02-27 14:27:56 +01:00
Casey Callendrello
70c153eb41 docs: minor improvements to 0.3.0 upgrade guidance 2017-02-27 14:27:56 +01:00
Gabe Rosenhouse
5b6d955695 docs: Edits to v0.3.0 upgrade guidance 2017-02-26 16:53:52 -08:00
Gabe Rosenhouse
fa53446854 docs: Edits to v0.3.0 upgrade guidance 2017-02-26 16:53:52 -08:00
Dan Williams
f658c0b4b3 docs: CNI versioning for 0.3.0 upgrade 2017-02-26 13:26:14 -08:00
Dan Williams
328ea56e75 docs: CNI versioning for 0.3.0 upgrade 2017-02-26 13:26:14 -08:00
Casey Callendrello
6e6ad53ea8 libcni: up-convert a Config to a ConfigList when no other configs are found. 2017-02-24 19:44:06 +01:00
Tom Denham
1bc8141105 Merge pull request #379 from Intel-Corp/master
README: List multus as 3rd party plugin
2017-02-23 10:40:59 -08:00
Aithal
460e1c5be3 vendor: Update vishvanana/netlink dependency 2017-02-23 09:53:11 -08:00
Aithal
7d5619d277 pkg/ip: refactored so that builds succeed on non-linux platforms
moved functions that depend on linux packages into a separate file and added
nop methods with a build tag for non-linux platforms in a new file.
2017-02-23 09:52:13 -08:00
Aithal
7eeb21a999 pkg/ip: refactored so that builds succeed on non-linux platforms
moved functions that depend on linux packages into a separate file and added
nop methods with a build tag for non-linux platforms in a new file.
2017-02-23 09:52:13 -08:00
Aithal
46deb7b708 pkg/ns, pkg/types: refactored non linux build fix code to
Make GetCurrentNS platform specific instead of getCurrentThreadNetNSPath
2017-02-23 09:50:48 -08:00
Aithal
0dc0845c51 pkg/ns, pkg/types: refactored non linux build fix code to
Make GetCurrentNS platform specific instead of getCurrentThreadNetNSPath
2017-02-23 09:50:48 -08:00
Dan Williams
aafc728ec0 Merge pull request #371 from rosenhouse/spec-netconf-routes
spec: Remove `routes` from Network Configuration
2017-02-22 20:32:41 -06:00
Bryan Boreham
32246b315c Replace Michael Bridgen with Bryan Boreham 2017-02-22 17:06:04 +00:00
Kuralamudhan Ramakrishnan
2c33eb4f22 README: List multus as 3rd party plugin
refer #343 issue
2017-02-22 16:13:12 +00:00
Gabe Rosenhouse
9f03c4bc2e Merge pull request #376 from zackhsi/fix-grammar
Fix grammar
2017-02-20 17:51:38 -08:00
Casey Callendrello
7fa16f18d9 plugins/main/ptp: set the Sandbox property on the response 2017-02-21 00:28:19 +01:00
Zack Hsi
c783679114 Fix grammar 2017-02-20 11:21:49 -08:00
Aithal
dff808c98e pkg/ns: refactored so that builds succeed on non-linux platforms
moved functions that depend on linux packages (sys/unix) into a separate file
and added nop methods with a build tag for non-linux platforms in a new file.
2017-02-20 10:00:55 -08:00
Aithal
c3cde44480 pkg/ns: refactored so that builds succeed on non-linux platforms
moved functions that depend on linux packages (sys/unix) into a separate file
and added nop methods with a build tag for non-linux platforms in a new file.
2017-02-20 10:00:55 -08:00
Gabe Rosenhouse
3ba89873ac Merge pull request #372 from rosenhouse/consolidate-host-local-docs
docs: consolidate host-local documentation
2017-02-20 06:33:32 -08:00
Gabe Rosenhouse
98eb0d93a1 docs: consolidate host-local documentation
- remove the README.md in the plugins/ipam/host-local (no other plugin
  has this)
- merge that info into the main Documentation/host-local.md
2017-02-15 15:20:13 -08:00
Gabe Rosenhouse
eb2ff7fe57 docs: consolidate host-local documentation
- remove the README.md in the plugins/ipam/host-local (no other plugin
  has this)
- merge that info into the main Documentation/host-local.md
2017-02-15 15:20:13 -08:00
Gabe Rosenhouse
31dafa2f7a spec: Remove routes from Network Configuration
- this is supported by some IPAM plugins but is not required of all of
  them
2017-02-15 15:02:23 -08:00
Tom Denham
6f3b0abcc7 Merge pull request #369 from containernetworking/port-mapping
CONVENTIONS.md: Update details on port-mappings
2017-02-14 11:47:59 -08:00