Skip to content

Commit a97520f

Browse files
committed
Merge pull request kubernetes#11176 from erictune/scratchfix
Remove mention of docker --bip flag.
2 parents e81645b + 006d757 commit a97520f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

docs/getting-started-guides/scratch.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,17 +348,15 @@ brctl delbr docker0
348348
```
349349

350350
The way you configure docker will depend in whether you have chosen the routable-vip or overlay-network approaches for your network.
351-
Some docker options will want to think about:
352-
- create your own bridge for the per-node CIDR ranges, and set `--bridge=cbr0` and `--bip=false`. Or let docker do it with `--bip=true`.
353-
- `--iptables=false` so docker will not manipulate iptables for host-ports (too coarse on older docker versions, may be fixed in newer versions)
351+
Some suggested docker options:
352+
- create your own bridge for the per-node CIDR ranges, call it cbr0, and set `--bridge=cbr0` option on docker.
353+
- set `--iptables=false` so docker will not manipulate iptables for host-ports (too coarse on older docker versions, may be fixed in newer versions)
354354
so that kube-proxy can manage iptables instead of docker.
355355
- `--ip-masq=false`
356356
- if you have setup PodIPs to be routable, then you want this false, otherwise, docker will
357357
rewrite the PodIP source-address to a NodeIP.
358358
- some environments (e.g. GCE) still need you to masquerade out-bound traffic when it leaves the cloud environment. This is very environment specific.
359359
- if you are using an overlay network, consult those instructions.
360-
- `--bip=`
361-
- should be the CIDR range for pods for that specific node.
362360
- `--mtu=`
363361
- may be required when using Flannel, because of the extra packet size due to udp encapsulation
364362
- `--insecure-registry $CLUSTER_SUBNET`
@@ -411,7 +409,7 @@ Arguments to consider:
411409

412410
### Networking
413411
Each node needs to be allocated its own CIDR range for pod networking.
414-
Call this `NODE_X_POD_CIDR`.
412+
Call this `NODE_X_POD_CIDR`.
415413

416414
A bridge called `cbr0` needs to be created on each node. The bridge is explained
417415
further in the [networking documentation](../admin/networking.md). The bridge itself

0 commit comments

Comments
 (0)