diff --git a/cluster/gce/coreos/master-docker.yaml b/cluster/gce/coreos/master-docker.yaml index a25ab811ccc..89685aadd9c 100644 --- a/cluster/gce/coreos/master-docker.yaml +++ b/cluster/gce/coreos/master-docker.yaml @@ -123,8 +123,7 @@ coreos: --logtostderr=true \ --container-runtime=docker \ --pod-cidr=${MASTER_IP_RANGE} \ - --register-schedulable=false \ - --reconcile-cidr=false + --register-schedulable=false Restart=always RestartSec=10 KillMode=process diff --git a/cluster/gce/coreos/master-rkt.yaml b/cluster/gce/coreos/master-rkt.yaml index f5082969eb8..8138a0469cb 100644 --- a/cluster/gce/coreos/master-rkt.yaml +++ b/cluster/gce/coreos/master-rkt.yaml @@ -183,8 +183,7 @@ coreos: --rkt-path=/opt/rkt/rkt \ --rkt-stage1-image=${RKT_STAGE_IMAGE} \ --pod-cidr=${MASTER_IP_RANGE} \ - --register-schedulable=false \ - --reconcile-cidr=false + --register-schedulable=false Restart=always RestartSec=10 KillMode=process diff --git a/cluster/gce/coreos/node-docker.yaml b/cluster/gce/coreos/node-docker.yaml index a436d18703c..87cc48429d4 100644 --- a/cluster/gce/coreos/node-docker.yaml +++ b/cluster/gce/coreos/node-docker.yaml @@ -102,8 +102,7 @@ coreos: --cluster-domain=${DNS_DOMAIN} \ --logtostderr=true \ --container-runtime=docker \ - --network-plugin=${NETWORK_PROVIDER} \ - --reconcile-cidr=true + --network-plugin=${NETWORK_PROVIDER} Restart=always RestartSec=10 KillMode=process diff --git a/cluster/gce/coreos/node-rkt.yaml b/cluster/gce/coreos/node-rkt.yaml index 5d8bbbbed07..20349762d82 100644 --- a/cluster/gce/coreos/node-rkt.yaml +++ b/cluster/gce/coreos/node-rkt.yaml @@ -148,8 +148,7 @@ coreos: --container-runtime=rkt \ --rkt-path=/opt/rkt/rkt \ --rkt-stage1-image=${RKT_STAGE1_IMAGE} \ - --network-plugin=kubenet \ - --reconcile-cidr=true + --network-plugin=kubenet Restart=always RestartSec=10 KillMode=process diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 05e0a3d0df7..e06b5e6183a 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -479,7 +479,6 @@ function start-kubelet { if [[ -n "${KUBELET_PORT:-}" ]]; then flags+=" --port=${KUBELET_PORT}" fi - local reconcile_cidr="true" if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then flags+=" --enable-debugging-handlers=false" flags+=" --hairpin-mode=none" @@ -490,7 +489,6 @@ function start-kubelet { # 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}" fi @@ -512,7 +510,6 @@ function start-kubelet { fi flags+=" --network-plugin=${NETWORK_PROVIDER}" fi - flags+=" --reconcile-cidr=${reconcile_cidr}" if [[ -n "${NON_MASQUERADE_CIDR:-}" ]]; then flags+=" --non-masquerade-cidr=${NON_MASQUERADE_CIDR}" fi diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index 02056a1ab5f..83db29243d8 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 --pod-cidr=10.123.45.0/29" 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 e836f0c3fcf..a24e91590f2 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -26,7 +26,6 @@ {% set debugging_handlers = "--enable-debugging-handlers=true" -%} -{% set reconcile_cidr_args = "" -%} {% if grains['roles'][0] == 'kubernetes-master' -%} {% if grains.cloud in ['aws', 'gce', 'vagrant', 'vsphere', 'photon-controller', 'openstack', 'azure-legacy'] -%} @@ -35,7 +34,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 -%} @@ -145,9 +143,6 @@ {% set network_plugin = "--network-plugin=cni --network-plugin-dir=/etc/cni/net.d/" %} {% elif pillar.get('network_provider', '').lower() == 'kubenet' %} {% set network_plugin = "--network-plugin=kubenet" -%} - {% if reconcile_cidr_args == '' -%} - {% set reconcile_cidr_args = "--reconcile-cidr=true" -%} - {% endif -%} {% endif -%} # Don't pipe the --hairpin-mode flag by default. This allows the kubelet to pick @@ -194,4 +189,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}} {{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}} {{ hairpin_mode }} {{enable_custom_metrics}} {{runtime_container}} {{kubelet_container}} {{node_labels}} {{babysit_daemons}} {{eviction_hard}} {{feature_gates}} {{test_args}}" diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index 6d71f15328e..1474023bfbb 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -450,11 +450,6 @@ function start_kubelet { net_plugin_dir_args="--network-plugin-dir=${NET_PLUGIN_DIR}" fi - kubenet_plugin_args="" - if [[ "${NET_PLUGIN}" == "kubenet" ]]; then - kubenet_plugin_args="--reconcile-cidr=true " - fi - container_runtime_endpoint_args="" if [[ -n "${CONTAINER_RUNTIME_ENDPOINT}" ]]; then container_runtime_endpoint_args="--container-runtime-endpoint=${CONTAINER_RUNTIME_ENDPOINT}" @@ -484,7 +479,6 @@ function start_kubelet { ${dns_args} \ ${net_plugin_dir_args} \ ${net_plugin_args} \ - ${kubenet_plugin_args} \ ${container_runtime_endpoint_args} \ ${image_service_endpoint_args} \ --port="$KUBELET_PORT" >"${KUBELET_LOG}" 2>&1 & diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index b8b13ad3a9c..5edc3cf747d 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -14,9 +14,7 @@ cluster/gce/configure-vm.sh: cloud_config: ${CLOUD_CONFIG} cluster/gce/configure-vm.sh: env-to-grains "feature_gates" cluster/gce/configure-vm.sh: env-to-grains "runtime_config" cluster/gce/configure-vm.sh: kubelet_api_servers: '${KUBELET_APISERVER}' -cluster/gce/gci/configure-helper.sh: reconcile_cidr="false" cluster/gce/gci/configure-helper.sh: local api_servers="--master=https://${KUBERNETES_MASTER_NAME}" -cluster/gce/gci/configure-helper.sh: local reconcile_cidr="true" cluster/gce/gci/configure-helper.sh: sed -i -e "s@{{ *storage_backend *}}@${STORAGE_BACKEND:-}@g" "${temp_file}" cluster/gce/gci/configure-helper.sh: sed -i -e "s@{{pillar\['allow_privileged'\]}}@true@g" "${src_file}" cluster/gce/trusty/configure-helper.sh: sed -i -e "s@{{ *storage_backend *}}@${STORAGE_BACKEND:-}@g" "${temp_file}" @@ -122,9 +120,6 @@ test/e2e/common/host_path.go: fmt.Sprintf("--file_content_in_loop=%v", filePat test/e2e/common/host_path.go: fmt.Sprintf("--file_content_in_loop=%v", filePathInReader), test/e2e/common/host_path.go: fmt.Sprintf("--retry_time=%d", retryDuration), test/e2e/common/host_path.go: fmt.Sprintf("--retry_time=%d", retryDuration), -test/e2e/cluster_logging_es.go: return fmt.Errorf("No cluster_name field in Elasticsearch response: %v", esResponse) -test/e2e/cluster_logging_es.go: // Check to see if have a cluster_name field. -test/e2e/cluster_logging_es.go: clusterName, ok := esResponse["cluster_name"] test/e2e_node/container_manager_test.go: return fmt.Errorf("expected pid %d's oom_score_adj to be %d; found %d", pid, expectedOOMScoreAdj, oomScore) test/e2e_node/container_manager_test.go: return fmt.Errorf("expected pid %d's oom_score_adj to be < %d; found %d", pid, expectedMaxOOMScoreAdj, oomScore) test/e2e_node/container_manager_test.go: return fmt.Errorf("expected pid %d's oom_score_adj to be >= %d; found %d", pid, expectedMinOOMScoreAdj, oomScore)