github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 22:20:18 +00:00
Code Issues Projects Releases Wiki Activity

Remove usage of --reconcile-cidr

Browse Source
This commit is contained in:
Lucas Käldström
2016-10-26 20:26:07 +03:00
parent 1cf00d1ff1
commit 6846e0b48a
9 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hack/local-up-cluster.sh
View File

@@ -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 &