summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-26 17:11:04 +0200
committerGitHub <noreply@github.com>2019-08-26 17:11:04 +0200
commit6240bd41cbaae6b02c773a57dc05fc2eba0f8285 (patch)
tree1877d4d0acead29301cf9d38d98de9c7a90d2380
parentc0528c152ebe2a972e2a44384ebd4ac87b936273 (diff)
parent7b4102ce286b5b52f5cbd9df832222f7c543e35c (diff)
downloadpodman-6240bd41cbaae6b02c773a57dc05fc2eba0f8285.tar.gz
podman-6240bd41cbaae6b02c773a57dc05fc2eba0f8285.tar.bz2
podman-6240bd41cbaae6b02c773a57dc05fc2eba0f8285.zip
Merge pull request #3755 from mheon/fix_cniname
Adjust name of Podman CNI network bridge
-rw-r--r--cni/87-podman-bridge.conflist55
1 files changed, 32 insertions, 23 deletions
diff --git a/cni/87-podman-bridge.conflist b/cni/87-podman-bridge.conflist
index 729d543ec..9db416a19 100644
--- a/cni/87-podman-bridge.conflist
+++ b/cni/87-podman-bridge.conflist
@@ -2,28 +2,37 @@
"cniVersion": "0.4.0",
"name": "podman",
"plugins": [
- {
- "type": "bridge",
- "bridge": "cni0",
- "isGateway": true,
- "ipMasq": true,
- "ipam": {
- "type": "host-local",
- "subnet": "10.88.0.0/16",
- "routes": [
- { "dst": "0.0.0.0/0" }
- ]
- }
- },
- {
- "type": "portmap",
- "capabilities": {
- "portMappings": true
- }
- },
- {
- "type": "firewall",
- "backend": "iptables"
- }
+ {
+ "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"
+ }
]
}