From 73b64e6da5003e8aee3b42aba2153ed3c7fd868a Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Fri, 30 Sep 2016 10:56:05 -0700 Subject: [PATCH 1/2] Correct env var name in configure-helper The variable should be KUBEPROXY_TEST_ARGS, not KUBE_PROXY_TEST_ARGS. --- cluster/gce/gci/configure-helper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 69de5189ff4..3f0ad1d3379 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -590,7 +590,7 @@ function start-kube-proxy { params+=" --feature-gates=${FEATURE_GATES}" fi if [[ -n "${KUBEPROXY_TEST_ARGS:-}" ]]; then - params+=" ${KUBE_PROXY_TEST_ARGS}" + params+=" ${KUBEPROXY_TEST_ARGS}" fi sed -i -e "s@{{kubeconfig}}@${kubeconfig}@g" ${src_file} sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" ${src_file} @@ -1131,7 +1131,7 @@ function start-rescheduler { function setup-kubelet-dir { echo "Making /var/lib/kubelet executable for kubelet" mount --bind /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 } function reset-motd { From edcf97db1dfeafe973f7e2ad203957b07f69b198 Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Fri, 30 Sep 2016 10:59:47 -0700 Subject: [PATCH 2/2] Change --bind to -B for consistency --- cluster/gce/gci/configure-helper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 3f0ad1d3379..7474831ae3c 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1130,7 +1130,7 @@ function start-rescheduler { # Setup working directory for kubelet. function setup-kubelet-dir { 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 }