Commit Graph

9 Commits

Author SHA1 Message Date
Giuseppe Scrivano e379f7eda1
cni: enable tuning plugin
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-11-06 16:22:20 +01:00
OpenShift Merge Robot 6240bd41cb
Merge pull request #3755 from mheon/fix_cniname
Adjust name of Podman CNI network bridge
2019-08-26 17:11:04 +02:00
Matthew Heon 7b4102ce28 Adjust name of Podman CNI network bridge
Both Podman and CRI-O set up CNI bridges with the name 'cni0'. If
both our CNI conflist and the CRI-O conflist are installed,
whoever runs first will win - that is, they will configure the
bridge, and everyone will use it. Problem: the CRI-O CNI config
conflicts with ours and results in containers with no networking.
Solution: rename our bridge so we don't conflict with CRI-O.

At the same time, hit our IPAM configuration. The current version
was an older format in danger of deprecation. The new format is
documented at [1].

Finally, fix indentation for the entire file.

[1] https://github.com/containernetworking/plugins/tree/master/plugins/ipam/host-local#example-configurations

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-08-23 11:27:28 -04:00
TomSweeneyRedHat ada0568f53 Update cni config instructions
Update the CNI configuration instructions to line up with
the changes introduced in #3868.  Also do a bit less documentation
of the configuration and point to the GitHub project so we won't
get out of sync in the future.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2019-08-22 19:39:07 -04:00
Giuseppe Scrivano 99983e20bb
networking: use firewall plugin
drop the pkg/firewall module and start using the firewall CNI plugin.
It requires an updated package for CNI plugins.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-08-19 16:16:06 +02:00
Tristan Cacqueray f9eb421348 docs: fix contrib/cni broken link
This change updates the install.md documentation to reference the new
cni directory location. This change also restores the previously
deleted README.md with updated instructions.

Signed-off-by: Tristan Cacqueray <tdecacqu@redhat.com>

Closes: #761
Approved by: baude
2018-05-14 13:30:39 +00:00
baude 946b4ced54 Enable port bindings
Set up nbetworking ports for the following use cases:

* bind the same port between host and container
* bind a specific host port to a different container port
* bind a random host port to a specific container port

Signed-off-by: baude <bbaude@redhat.com>

Closes: #214
Approved by: baude
2018-01-20 18:51:21 +00:00
Dan Williams 69a415f033 cni: 98-podman-loopback.conf is not needed
ocicni internally handles the loopback so this file is not required.

Signed-off-by: Dan Williams <dcbw@redhat.com>

Closes: #193
Approved by: mheon
2018-01-08 14:10:51 +00:00
baude 7f531263e6 Add default CNI configuration
podman needs a pair of configuration files to set up its default
network configuration: a bridge and loopback file.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #161
Approved by: baude
2017-12-22 19:23:36 +00:00