diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-20 15:12:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 15:12:33 +0100 |
| commit | 126f75d7be3353c2df7ed1c3f9c6e0a7b707422e (patch) | |
| tree | e26fd523e1460dccc3b4929ff883d6abf19d424b | |
| parent | cf8e34c28ed623b8fe58c66ead180298210e53bb (diff) | |
| parent | d90726c6d84dfa9e2940817a6e3d0122abe17aff (diff) | |
| download | podman-126f75d7be3353c2df7ed1c3f9c6e0a7b707422e.tar.gz podman-126f75d7be3353c2df7ed1c3f9c6e0a7b707422e.tar.bz2 podman-126f75d7be3353c2df7ed1c3f9c6e0a7b707422e.zip | |
Merge pull request #5277 from openSUSE/pretty-cni
Beautify podman bridge CNI config
| -rw-r--r-- | cni/87-podman-bridge.conflist | 72 |
1 files changed, 34 insertions, 38 deletions
diff --git a/cni/87-podman-bridge.conflist b/cni/87-podman-bridge.conflist index a7bcf47bb..39e79b13c 100644 --- a/cni/87-podman-bridge.conflist +++ b/cni/87-podman-bridge.conflist @@ -1,41 +1,37 @@ { - "cniVersion": "0.4.0", - "name": "podman", - "plugins": [ - { - "type": "bridge", - "bridge": "cni-podman0", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "routes": [ - { - "dst": "0.0.0.0/0" - } - ], - "ranges": [ - [ - { - "subnet": "10.88.0.0/16", - "gateway": "10.88.0.1" - } - ] - ] + "cniVersion": "0.4.0", + "name": "podman", + "plugins": [ + { + "type": "bridge", + "bridge": "cni-podman0", + "isGateway": true, + "ipMasq": true, + "ipam": { + "type": "host-local", + "routes": [{ "dst": "0.0.0.0/0" }], + "ranges": [ + [ + { + "subnet": "10.88.0.0/16", + "gateway": "10.88.0.1" } - }, - { - "type": "portmap", - "capabilities": { - "portMappings": true - } - }, - { - "type": "firewall", - "backend": "iptables" - }, - { - "type": "tuning" - } - ] + ] + ] + } + }, + { + "type": "portmap", + "capabilities": { + "portMappings": true + } + }, + { + "type": "firewall", + "backend": "iptables" + }, + { + "type": "tuning" + } + ] } |