From 879a2dcdbd415638b8770a43d0f9fd8cd2899836 Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Fri, 16 Sep 2016 11:19:40 -0700 Subject: [PATCH] bump master cidr range from /30 to /29 --- cluster/aws/templates/configure-vm-aws.sh | 4 ++-- cluster/gce/configure-vm.sh | 4 ++-- cluster/gce/gci/configure-helper.sh | 5 ++++- cluster/gce/trusty/configure-helper.sh | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cluster/aws/templates/configure-vm-aws.sh b/cluster/aws/templates/configure-vm-aws.sh index aacdff741ca..6abca6ed436 100755 --- a/cluster/aws/templates/configure-vm-aws.sh +++ b/cluster/aws/templates/configure-vm-aws.sh @@ -91,7 +91,7 @@ EOF if [[ ! -z "${KUBELET_APISERVER:-}" ]] && [[ ! -z "${KUBELET_CERT:-}" ]] && [[ ! -z "${KUBELET_KEY:-}" ]]; then cat <>/etc/salt/minion.d/grains.conf kubelet_api_servers: '${KUBELET_APISERVER}' - cbr-cidr: 10.123.45.0/30 + cbr-cidr: 10.123.45.0/29 EOF else # If the kubelet is running disconnected from a master, give it a fixed @@ -110,7 +110,7 @@ salt-node-role() { grains: roles: - kubernetes-pool - cbr-cidr: 10.123.45.0/30 + cbr-cidr: 10.123.45.0/29 cloud: aws api_servers: '${API_SERVERS}' EOF diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh index 1f37258da73..4da8e543242 100755 --- a/cluster/gce/configure-vm.sh +++ b/cluster/gce/configure-vm.sh @@ -949,7 +949,7 @@ EOF if [[ ! -z "${KUBELET_APISERVER:-}" ]] && [[ ! -z "${KUBELET_CERT:-}" ]] && [[ ! -z "${KUBELET_KEY:-}" ]]; then cat <>/etc/salt/minion.d/grains.conf kubelet_api_servers: '${KUBELET_APISERVER}' - cbr-cidr: 10.123.45.0/30 + cbr-cidr: 10.123.45.0/29 EOF else # If the kubelet is running disconnected from a master, give it a fixed @@ -968,7 +968,7 @@ function salt-node-role() { grains: roles: - kubernetes-pool - cbr-cidr: 10.123.45.0/30 + cbr-cidr: 10.123.45.0/29 cloud: gce api_servers: '${KUBERNETES_MASTER_NAME}' EOF diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 12dfaee7e76..4471435548b 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -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}" diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index e5c188ebdd1..262289f32b5 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -155,7 +155,7 @@ assemble_kubelet_flags() { if [ ! -z "${KUBELET_APISERVER:-}" ] && \ [ ! -z "${KUBELET_CERT:-}" ] && \ [ ! -z "${KUBELET_KEY:-}" ]; then - KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --api-servers=https://${KUBELET_APISERVER} --register-schedulable=false --reconcile-cidr=false --pod-cidr=10.123.45.0/30" + KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --api-servers=https://${KUBELET_APISERVER} --register-schedulable=false --reconcile-cidr=false --pod-cidr=10.123.45.0/29" else KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --pod-cidr=${MASTER_IP_RANGE}" fi