summaryrefslogtreecommitdiff
path: root/cni
Commit message (Collapse)AuthorAge
* Merge pull request #3755 from mheon/fix_cninameOpenShift Merge Robot2019-08-26
|\ | | | | Adjust name of Podman CNI network bridge
| * Adjust name of Podman CNI network bridgeMatthew Heon2019-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Update cni config instructionsTomSweeneyRedHat2019-08-22
|/ | | | | | | | | 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>
* networking: use firewall pluginGiuseppe Scrivano2019-08-19
| | | | | | | 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>
* docs: fix contrib/cni broken linkTristan Cacqueray2018-05-14
| | | | | | | | | | | 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
* Enable port bindingsbaude2018-01-20
| | | | | | | | | | | | | 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
* cni: 98-podman-loopback.conf is not neededDan Williams2018-01-08
| | | | | | | | | ocicni internally handles the loopback so this file is not required. Signed-off-by: Dan Williams <dcbw@redhat.com> Closes: #193 Approved by: mheon
* Add default CNI configurationbaude2017-12-22
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