bump master cidr range from /30 to /29

This commit is contained in:
Minhan Xia
2016-09-16 11:19:40 -07:00
parent fc466743a8
commit 879a2dcdbd
4 changed files with 9 additions and 6 deletions

View File

@@ -480,7 +480,10 @@ function start-kubelet {
if [[ ! -z "${KUBELET_APISERVER:-}" && ! -z "${KUBELET_CERT:-}" && ! -z "${KUBELET_KEY:-}" ]]; then
flags+=" --api-servers=https://${KUBELET_APISERVER}"
flags+=" --register-schedulable=false"
flags+=" --pod-cidr=10.123.45.0/30"
# need at least a /29 pod cidr for now due to #32844
# TODO: determine if we still allow non-hostnetwork pods to run on master, clean up master pod setup
# WARNING: potential ip range collision with 10.123.45.0/29
flags+=" --pod-cidr=10.123.45.0/29"
reconcile_cidr="false"
else
flags+=" --pod-cidr=${MASTER_IP_RANGE}"