From 6465742da1d0dc3d8bfeec6eb92ba66f30f79f1d Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 22 Sep 2016 23:05:28 -0400 Subject: [PATCH] Update bringup: don't pass in dummy pod-cidr We no longer pass in a "dummy" pod-cidr (10.123.45.0/29), and rely on reconcile-cidr=true instead (which is the default). --- cluster/aws/templates/configure-vm-aws.sh | 2 -- cluster/gce/configure-vm.sh | 2 -- cluster/gce/gci/configure-helper.sh | 6 +----- cluster/gce/trusty/configure-helper.sh | 2 +- cluster/saltbase/salt/kubelet/default | 1 - 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/cluster/aws/templates/configure-vm-aws.sh b/cluster/aws/templates/configure-vm-aws.sh index 6abca6ed436..0be5203add1 100755 --- a/cluster/aws/templates/configure-vm-aws.sh +++ b/cluster/aws/templates/configure-vm-aws.sh @@ -91,7 +91,6 @@ 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/29 EOF else # If the kubelet is running disconnected from a master, give it a fixed @@ -110,7 +109,6 @@ salt-node-role() { grains: roles: - kubernetes-pool - 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 44a56f2ab78..558a019d84c 100755 --- a/cluster/gce/configure-vm.sh +++ b/cluster/gce/configure-vm.sh @@ -949,7 +949,6 @@ 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/29 EOF else # If the kubelet is running disconnected from a master, give it a fixed @@ -968,7 +967,6 @@ function salt-node-role() { grains: roles: - kubernetes-pool - 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 7474831ae3c..4999c735f68 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -486,12 +486,8 @@ function start-kubelet { if [[ ! -z "${KUBELET_APISERVER:-}" && ! -z "${KUBELET_CERT:-}" && ! -z "${KUBELET_KEY:-}" ]]; then flags+=" --api-servers=https://${KUBELET_APISERVER}" flags+=" --register-schedulable=false" - # 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 + # Standalone mode (not widely used?) flags+=" --pod-cidr=${MASTER_IP_RANGE}" fi else # For nodes diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index 262289f32b5..91d604c1aee 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/29" + KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --api-servers=https://${KUBELET_APISERVER} --register-schedulable=false" else KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --pod-cidr=${MASTER_IP_RANGE}" fi diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 684aefb5431..291aa053577 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -35,7 +35,6 @@ {% if grains.kubelet_api_servers is defined -%} {% set api_servers_with_port = "--api-servers=https://" + grains.kubelet_api_servers -%} {% set master_kubelet_args = master_kubelet_args + "--register-schedulable=false" -%} - {% set reconcile_cidr_args = "--reconcile-cidr=false" -%} {% else -%} {% set api_servers_with_port = "" -%} {% endif -%}