github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #24965 from Arvinderpal/add_cni_dir_to_local_cluster_up 

Automatic merge from submit-queue

Adds --network-plugin-dir argument to hack/local-up-cluster.sh

CNI Network Plugin developers who want to use hack/local-up-cluster.sh need to specify the --network-plugin-dir option to kubelet.
pull/6/head
k8s-merge-robot 2016-05-28 11:53:54 -07:00
parent ce788c45ef 1a92f2b9de
commit a24584465e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ ALLOW_PRIVILEGED=${ALLOW_PRIVILEGED:-""}
ALLOW_SECURITY_CONTEXT=${ALLOW_SECURITY_CONTEXT:-""} ALLOW_SECURITY_CONTEXT=${ALLOW_SECURITY_CONTEXT:-""}
RUNTIME_CONFIG=${RUNTIME_CONFIG:-""} RUNTIME_CONFIG=${RUNTIME_CONFIG:-""}
NET_PLUGIN=${NET_PLUGIN:-""} NET_PLUGIN=${NET_PLUGIN:-""}
NET_PLUGIN_DIR=${NET_PLUGIN_DIR:-""}
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
# We disable cluster DNS by default because this script uses docker0 (or whatever # We disable cluster DNS by default because this script uses docker0 (or whatever
# container bridge docker is currently using) and we don't know the IP of the # container bridge docker is currently using) and we don't know the IP of the
@ -340,6 +341,11 @@ function start_kubelet {
net_plugin_args="--network-plugin=${NET_PLUGIN}" net_plugin_args="--network-plugin=${NET_PLUGIN}"
fi fi
net_plugin_dir_args=""
if [[ -n "${NET_PLUGIN_DIR}" ]]; then
net_plugin_dir_args="--network-plugin-dir=${NET_PLUGIN_DIR}"
fi
kubenet_plugin_args="" kubenet_plugin_args=""
if [[ "${NET_PLUGIN}" == "kubenet" ]]; then if [[ "${NET_PLUGIN}" == "kubenet" ]]; then
kubenet_plugin_args="--reconcile-cidr=true " kubenet_plugin_args="--reconcile-cidr=true "
@ -357,6 +363,7 @@ function start_kubelet {
--api-servers="${API_HOST}:${API_PORT}" \ --api-servers="${API_HOST}:${API_PORT}" \
--cpu-cfs-quota=${CPU_CFS_QUOTA} \ --cpu-cfs-quota=${CPU_CFS_QUOTA} \
${dns_args} \ ${dns_args} \
${net_plugin_dir_args} \
${net_plugin_args} \ ${net_plugin_args} \
${kubenet_plugin_args} \ ${kubenet_plugin_args} \
--port="$KUBELET_PORT" >"${KUBELET_LOG}" 2>&1 & --port="$KUBELET_PORT" >"${KUBELET_LOG}" 2>&1 &