diff --git a/cluster/common.sh b/cluster/common.sh index 2557d6ff16..aba7b0ca6a 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -770,7 +770,6 @@ KUBERNETES_CONTAINER_RUNTIME: $(yaml-quote ${CONTAINER_RUNTIME:-rkt}) RKT_VERSION: $(yaml-quote ${RKT_VERSION:-}) RKT_PATH: $(yaml-quote ${RKT_PATH:-}) RKT_STAGE1_IMAGE: $(yaml-quote ${RKT_STAGE1_IMAGE:-}) -KUBERNETES_CONFIGURE_CBR0: $(yaml-quote ${KUBERNETES_CONFIGURE_CBR0:-true}) EOF fi if [[ "${ENABLE_CLUSTER_AUTOSCALER}" == "true" ]]; then diff --git a/cluster/gce/coreos/master-docker.yaml b/cluster/gce/coreos/master-docker.yaml index 0f9a76cfe1..a25ab811cc 100644 --- a/cluster/gce/coreos/master-docker.yaml +++ b/cluster/gce/coreos/master-docker.yaml @@ -122,7 +122,6 @@ coreos: --cluster-domain=${DNS_DOMAIN} \ --logtostderr=true \ --container-runtime=docker \ - --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} \ --pod-cidr=${MASTER_IP_RANGE} \ --register-schedulable=false \ --reconcile-cidr=false diff --git a/cluster/gce/coreos/master-rkt.yaml b/cluster/gce/coreos/master-rkt.yaml index ac26528054..f5082969eb 100644 --- a/cluster/gce/coreos/master-rkt.yaml +++ b/cluster/gce/coreos/master-rkt.yaml @@ -182,7 +182,6 @@ coreos: --container-runtime=rkt \ --rkt-path=/opt/rkt/rkt \ --rkt-stage1-image=${RKT_STAGE_IMAGE} \ - --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} \ --pod-cidr=${MASTER_IP_RANGE} \ --register-schedulable=false \ --reconcile-cidr=false diff --git a/cluster/gce/coreos/node-docker.yaml b/cluster/gce/coreos/node-docker.yaml index 5e313fa967..a436d18703 100644 --- a/cluster/gce/coreos/node-docker.yaml +++ b/cluster/gce/coreos/node-docker.yaml @@ -102,7 +102,6 @@ coreos: --cluster-domain=${DNS_DOMAIN} \ --logtostderr=true \ --container-runtime=docker \ - --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} \ --network-plugin=${NETWORK_PROVIDER} \ --reconcile-cidr=true Restart=always diff --git a/cluster/gce/coreos/node-rkt.yaml b/cluster/gce/coreos/node-rkt.yaml index 2f180aa8e9..5d8bbbbed0 100644 --- a/cluster/gce/coreos/node-rkt.yaml +++ b/cluster/gce/coreos/node-rkt.yaml @@ -148,7 +148,6 @@ coreos: --container-runtime=rkt \ --rkt-path=/opt/rkt/rkt \ --rkt-stage1-image=${RKT_STAGE1_IMAGE} \ - --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} \ --network-plugin=kubenet \ --reconcile-cidr=true Restart=always diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 7474831ae3..32de3d840a 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -529,9 +529,6 @@ function start-kubelet { if [[ -n "${EVICTION_HARD:-}" ]]; then flags+=" --eviction-hard=${EVICTION_HARD}" fi - if [[ "${ALLOCATE_NODE_CIDRS:-}" == "true" ]]; then - flags+=" --configure-cbr0=${ALLOCATE_NODE_CIDRS}" - fi if [[ -n "${FEATURE_GATES:-}" ]]; then flags+=" --feature-gates=${FEATURE_GATES}" fi diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index 262289f32b..02056a1ab5 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -176,9 +176,6 @@ assemble_kubelet_flags() { if [ -n "${NODE_LABELS:-}" ]; then KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --node-labels=${NODE_LABELS}" fi - if [ "${ALLOCATE_NODE_CIDRS:-}" = "true" ]; then - KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --configure-cbr0=${ALLOCATE_NODE_CIDRS}" - fi # Add the unconditional flags KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --cloud-provider=gce --allow-privileged=true --cgroup-root=/ --system-cgroups=/system --kubelet-cgroups=/kubelet --babysit-daemons=true --config=/etc/kubernetes/manifests --cluster-dns=${DNS_SERVER_IP} --cluster-domain=${DNS_DOMAIN}" echo "KUBELET_OPTS=\"${KUBELET_CMD_FLAGS}\"" > /etc/default/kubelet diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 684aefb543..e836f0c3fc 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -87,11 +87,6 @@ {% set kubelet_root = " --root-dir=" + grains.kubelet_root -%} {% endif -%} -{% set configure_cbr0 = "" -%} -{% if pillar['allocate_node_cidrs'] is defined -%} - {% set configure_cbr0 = "--configure-cbr0=" + pillar['allocate_node_cidrs'] -%} -{% endif -%} - {% set non_masquerade_cidr = "" -%} {% if pillar.get('non_masquerade_cidr','') -%} {% set non_masquerade_cidr = "--non-masquerade-cidr=" + pillar.non_masquerade_cidr -%} @@ -199,4 +194,4 @@ {% endif -%} # test_args has to be kept at the end, so they'll overwrite any prior configuration -DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{cloud_config}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{log_level}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{non_masquerade_cidr}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{ master_kubelet_args }} {{cpu_cfs_quota}} {{network_plugin}} {{kubelet_port}} {{ reconcile_cidr_args }} {{ hairpin_mode }} {{enable_custom_metrics}} {{runtime_container}} {{kubelet_container}} {{node_labels}} {{babysit_daemons}} {{eviction_hard}} {{feature_gates}} {{test_args}}" +DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{cloud_config}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{log_level}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{non_masquerade_cidr}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{ master_kubelet_args }} {{cpu_cfs_quota}} {{network_plugin}} {{kubelet_port}} {{ reconcile_cidr_args }} {{ hairpin_mode }} {{enable_custom_metrics}} {{runtime_container}} {{kubelet_container}} {{node_labels}} {{babysit_daemons}} {{eviction_hard}} {{feature_gates}} {{test_args}}"