1123 Commits

Author SHA1 Message Date
Dan Williams
a6a8a818e4
Merge pull request #314 from mccv1r0/ipam303
Have ipam.ExecDel set CNI_COMMAND to DEL
2019-05-08 11:09:39 -05:00
Michael Cambria
02ccf1ef9b Have ipam.ExecDel set CNI_COMMAND to DEL 2019-05-08 11:50:28 -04:00
Casey Callendrello
a03e6b505e
Merge pull request #307 from SchSeba/l2-macvlan
Allow to configure empty ipam for macvlan
2019-05-08 17:27:52 +02:00
Dan Williams
6bceb68143
Merge pull request #309 from nagiesek/flannel
Flannel: Pass through runtimeConfig to delegate
2019-05-08 10:25:50 -05:00
Dan Williams
e2187efec1
Merge pull request #312 from nagiesek/caseInsensitiveCompare
Windows: case insensitive compare for ids
2019-05-08 10:25:28 -05:00
Nathan Gieseker
5a78120e24 Windows: case insensitive compare for ids 2019-05-02 19:54:39 -07:00
Nathan Gieseker
071907f867 Flannel: pass runtimeConfig into delegate 2019-05-01 15:58:24 -07:00
Dan Williams
2d6d46d308
Merge pull request #311 from dcbw/get-to-check-cleanups
windows,flannel: cmdGet -> cmdCheck and fix flannel Check return
2019-05-01 14:17:48 -05:00
Sebastian Sch
af692de1b8 Allow to configure empty ipam for macvlan
This PR add the option to configure an empty ipam for the macvlan cni plugin.

When using the macvlan cni plugin with an empty ipam the requeted pod will get the macvlan interface but without any ip address.

One of the use cases for this feature is for projects that runs a dhcp server inside the pod like KubeVirt.
In KubeVirt we need to let the vm running inside the pod to make the dhcp request so it will be able to make a release an renew request when needed.
2019-05-01 20:29:22 +03:00
Dan Williams
ae0b03787f windows,flannel: cmdGet -> cmdCheck and fix flannel Check return 2019-05-01 10:48:14 -05:00
Dan Williams
b199dc3ffe
Merge pull request #310 from squeed/cni-07
vendor: bump cni to v0.7.0
2019-04-30 09:38:20 -05:00
Casey Callendrello
dbc86e4db2
Merge pull request #298 from s1061123/dev/macvlan-default-master
macvlan: make master config as optional
2019-04-30 15:47:51 +02:00
Casey Callendrello
29801c45a7 vendor: bump cni to v0.7.0 2019-04-30 15:46:12 +02:00
Dan Williams
44297f6ba3
Merge pull request #304 from mccv1r0/sbrnoop
Don't return error for cmdCheck() when support is not implemented
2019-04-24 15:30:59 -05:00
Michael Cambria
cc4976a43c return nil instead of error for cmdCheck until support is added 2019-04-24 13:47:58 -04:00
Dan Williams
827a4bd843
Merge pull request #301 from mars1024/bugfix/ipam_revert
fix bug on ip revert if cmdAdd fails on macvlan and host-device
2019-04-24 10:36:40 -05:00
Dan Williams
697550083d
Merge pull request #286 from nagiesek/noErrorEndpointNotFound
Windows: No error for no endpoint on DEL. Ipam clean-up on ADD failure
2019-04-24 10:36:25 -05:00
Bruce Ma
214bcb8c8b fix bug on ipam revert if cmdAdd fails on macvlan and host-device 2019-04-18 21:16:29 +08:00
nagiesek
635968aaff
Merge branch 'master' into noErrorEndpointNotFound 2019-04-17 23:04:04 -07:00
Dan Williams
7df5acee0f
Merge pull request #288 from dcbw/coveralls
test: add coveralls support
2019-04-17 13:54:51 -05:00
Tomofumi Hayashi
7924ef76da Incorporate with reviewer's comments 2019-04-18 00:54:31 +09:00
Casey Callendrello
5e25b0e40c
Merge pull request #295 from squeed/buildversion
plugins: correctly output build version, cosmetic cleanups
2019-04-17 17:54:05 +02:00
Nathan Gieseker
688a87a055 Windows: No error for no endpoint found On Del. Ipam clean-up on ADD failure.
We used to return error if no endpoint was found during delete. We now treat this as a success. If we fail during an add call, we now make a delete delegate call to the ipam to clean-up.
2019-04-17 08:33:10 -07:00
Dan Williams
229ec3602d test: add coveralls support 2019-04-17 10:30:11 -05:00
Tomofumi Hayashi
8c52f50849 macvlan: make master config as optional
To ease of config, make master config as optional parameter.
In default case, default route interface will be used for master.
2019-04-17 16:28:27 +09:00
Casey Callendrello
6ea047fe09 build_linux: don't build the sample plugin
It shouldn't be included in releases.
2019-04-15 16:52:11 +02:00
Casey Callendrello
72f2a1ffd4 plugins: correctly output build version, cosmetic cleanups
Now that libcni has the ability to print a version message, plumb it
through correctly.

While we're at it,
- fix import paths
- run gofmt
- add some more comments to sample
- add container runtime swappability for release
2019-04-15 16:52:07 +02:00
Dan Williams
6733d30762
Merge pull request #290 from mccv1r0/pr75
PR75 updated with Check Support
2019-04-12 14:15:10 -05:00
Michael Cambria
d47387c6fe Add Check support to firewall meta plugin, test cases 2019-04-12 14:37:21 -04:00
Dan Williams
95be5da5e2 firewall: add a couple more testcases 2019-04-12 14:37:21 -04:00
Dan Williams
b46e1a0138 firewall: consolidate firewalld code into firewall plugin 2019-04-12 14:37:21 -04:00
Michal Rostecki
9d6f1e9975 firewall: add firewalld functionality to firewall plugin
Example of usage, which uses flannel for allocating IP
addresses for containers and then registers them in `trusted`
zone in firewalld:

{
  "cniVersion": "0.3.1",
  "name": "flannel-firewalld",
  "plugins": [
    {
      "name": "cbr0",
      "type": "flannel",
      "delegate": {
        "isDefaultGateway": true
      }
    },
    {
      "type": "firewall",
      "backend": "firewalld",
      "zone": "trusted"
    }
  ]
}

Fixes #114

Signed-off-by: Alban Crequy <alban@kinvolk.io>
Signed-off-by: Michal Rostecki <mrostecki@suse.com>
2019-04-12 14:37:21 -04:00
Michal Rostecki
eb66fc201c vendor: Add github.com/godbus/dbus
Signed-off-by: Michal Rostecki <mrostecki@suse.com>
2019-04-12 14:37:21 -04:00
Dan Williams
d096a4df48 firewall: new plugin which allows a host interface to send/receive traffic
Distros often have additional rules in the their iptabvles 'filter' table
that do things like:

-A FORWARD -j REJECT --reject-with icmp-host-prohibited

docker, for example, gets around this by adding explicit rules to the filter
table's FORWARD chain to allow traffic from the docker0 interface.  Do that
for a given host interface too, as a chained plugin.
2019-04-12 14:37:21 -04:00
Dan Williams
e9e1d37309
Merge pull request #231 from SchSeba/add-vlan-tag-to-bridge
Added vlan tag to the bridge cni plugin.
2019-04-11 11:58:33 -05:00
Sebastian Sch
b69a2dd3d7 Added vlan tag to the bridge cni plugin.
With the VLAN filter, the Linux bridge acts more like a real switch, Allow to tag and untag
vlan id's on every interface connected to the bridge.

This PR also creates a veth interface for the bridge vlan interface on L3 configuration.

Related to https://developers.redhat.com/blog/2017/09/14/vlan-filter-support-on-bridge/ post.

Note: This feature was introduced in Linux kernel 3.8 and was added to RHEL in version 7.0.
2019-04-10 21:59:52 +03:00
Bryan Boreham
0d6198bac4
Merge pull request #292 from squeed/cni-07
vendor: bump libcni to v0.7.0-rc2
2019-04-10 16:50:25 +01:00
Michael Cambria
914f2bc740 set CGO_ENABLED=0 in travis.yml 2019-04-10 17:24:42 +02:00
Casey Callendrello
e028b70b49 vendor: bump libcni to v0.7.0-rc2 2019-04-10 17:16:27 +02:00
Casey Callendrello
fbd9accd14
Merge pull request #268 from s1061123/fix/dhcp_daemon_hostprefix
Fix -hostprefix option
2019-04-08 12:53:09 +02:00
Tomofumi Hayashi
8b53f80fa8 Incorporate with @bboreham comment 2019-04-05 03:38:20 +09:00
Sebastian Sch
dc536993e2 vendor folder bump. 2019-04-04 16:39:05 +03:00
Dan Williams
18874aac7d
Merge pull request #264 from mccv1r0/add-check
Add CHECK support for linux plugins
2019-04-03 12:58:41 -05:00
Michael Cambria
74a2596573 Add check support for: bridge, ipvlan, macvlan, p2p, vlan and host-device main plugins
host-local and static ipam plugins
  tuning, bandwidth and portmap meta plugins

  Utility functions created for common PrevResult checking

  Fix windows build
2019-04-03 13:08:07 -04:00
Dan Williams
8a3d149a60
Merge pull request #284 from francares/fmc_dhcp_subnetmask
IPAM/DHCP: include Subnet Mask option parameter in DHCPREQUEST
2019-04-01 14:56:13 -05:00
Dan Williams
9c9a8e991d
Merge pull request #271 from nagiesek/dnsRuntimeConfigWindows
Windows: Add runtime DNS and del bug fix
2019-03-27 10:58:05 -05:00
Dan Williams
f55d8d02ce
Merge pull request #276 from s1061123/dev/add-dhcp-systemd-file
Add systemd unit file to activate socket with systemd
2019-03-27 09:23:15 -05:00
Casares, Francisco M
d577d9cc24 DHCP: include Subnet Mask option parameter in DHCPREQUEST
DHCP REQUEST from DHCP plugin does not include Subnet Mask option parameter (1). Some DHCP servers need that option to be explicit in order to return it in a DHCPACK message.
If not, DHCP plugin returns "DHCP option Subnet Mask not found in DHCPACK" error msg in this type of scenario.
2019-03-26 12:49:48 -07:00
Tomofumi Hayashi
4ec62ac295 Fix -hostprefix option
Fix #267
2019-03-26 18:27:46 +09:00
Dan Williams
82a0651d0a
Merge pull request #278 from dcbw/portmap-prepend
Portmap: append, rather than prepend, entry rules
2019-03-20 10:21:01 -05:00