Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove mention of docker --bip flag. #11176

Merged
merged 1 commit into from
Jul 17, 2015
Merged

Conversation

erictune
Copy link
Member

No description provided.

@erictune
Copy link
Member Author

fixes #11167

@k8s-bot
Copy link

k8s-bot commented Jul 13, 2015

GCE e2e build/test passed for commit 92fc0cbf46d6a77b118b0fcd449a3fc9b1d95244.

@@ -336,7 +336,7 @@ brctl delbr docker0

The way you configure docker will depend in whether you have chosen the routable-vip or overlay-network approaches for your network.
Some docker options will want to think about:
- 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`.
- create your own bridge for the per-node CIDR ranges, and set `--bridge=cbr0`. Or let docker do it with something like: `--bip=$NODE_X_POD_CIDR`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think mentioning --bip is more complex that simply documenting our cbr0 flag to kubelet and making those instructions good. For example, --bip assumes that docker0 does not exist, but if it does exist with a different IP, docker fails to start.

@erictune
Copy link
Member Author

@thockin ptal

@erictune erictune changed the title Fix explanation of docker --bip flag. Remove mention of docker --bip flag. Jul 14, 2015
@k8s-bot
Copy link

k8s-bot commented Jul 14, 2015

GCE e2e build/test passed for commit a6f795c075241d4f5fe66ea5e307fb0c2c162f30.

so that kube-proxy can manage iptables instead of docker.
- `--ip-masq=false`
- if you have setup PodIPs to be routable, then you want this false, otherwise, docker will
rewrite the PodIP source-address to a NodeIP.
- some environments (e.g. GCE) still need you to masquerade out-bound traffic when it leaves the cloud environment. This is very environment specific.
- if you are using an overlay network, consult those instructions.
- `--bip=`
- should be the CIDR range for pods for that specific node.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

forgot to remove this line?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still true

@erictune
Copy link
Member Author

PTAL

@thockin thockin added lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-merge labels Jul 17, 2015
@thockin
Copy link
Member

thockin commented Jul 17, 2015

LGTM

@erictune erictune added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jul 17, 2015
@k8s-bot
Copy link

k8s-bot commented Jul 17, 2015

GCE e2e build/test passed for commit 920eb5e0839558de40b5b16cd56df64c2d3b0840.

@k8s-bot
Copy link

k8s-bot commented Jul 17, 2015

GCE e2e build/test failed for commit 006d757.

@erictune erictune mentioned this pull request Jul 17, 2015
@davidopp
Copy link
Member

@k8s-bot test this please

@k8s-bot
Copy link

k8s-bot commented Jul 17, 2015

GCE e2e build/test passed for commit 006d757.

davidopp added a commit that referenced this pull request Jul 17, 2015
Remove mention of docker --bip flag.
@davidopp davidopp merged commit a97520f into kubernetes:master Jul 17, 2015
@erictune erictune deleted the scratchfix branch July 28, 2015 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants