github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33848 from mtaufen/fix-configure-helper

Browse Source 
Automatic merge from submit-queue

Correct env var name in configure-helper
This commit is contained in:
Kubernetes Submit Queue 2016-09-30 14:54:13 -07:00 committed by GitHub
commit 20e764ab5d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/gci/configure-helper.sh
View File

@ -590,7 +590,7 @@ function start-kube-proxy {
params+=" --feature-gates=${FEATURE_GATES}" params+=" --feature-gates=${FEATURE_GATES}"
fi fi
if [[ -n "${KUBEPROXY_TEST_ARGS:-}" ]]; then if [[ -n "${KUBEPROXY_TEST_ARGS:-}" ]]; then
params+=" ${KUBE_PROXY_TEST_ARGS}" params+=" ${KUBEPROXY_TEST_ARGS}"
fi fi
sed -i -e "s@{{kubeconfig}}@${kubeconfig}@g" ${src_file} sed -i -e "s@{{kubeconfig}}@${kubeconfig}@g" ${src_file}
sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" ${src_file} sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" ${src_file}
@ -1130,7 +1130,7 @@ function start-rescheduler {
# Setup working directory for kubelet. # Setup working directory for kubelet.
function setup-kubelet-dir { function setup-kubelet-dir {
echo "Making /var/lib/kubelet executable for kubelet" echo "Making /var/lib/kubelet executable for kubelet"
mount --bind /var/lib/kubelet /var/lib/kubelet/ mount -B /var/lib/kubelet /var/lib/kubelet/
mount -B -o remount,exec,suid,dev /var/lib/kubelet mount -B -o remount,exec,suid,dev /var/lib/kubelet
} }