github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20960 from andyzheng0831/fix

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-11 06:51:13 -08:00
commit 798b88e512
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/gce/trusty/master.yaml
View File

@ -130,8 +130,11 @@ script
fi fi
# Assemble command line flags based on env variables. # Assemble command line flags based on env variables.
ARGS="--v=2" ARGS="--v=2"
if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
ARGS="${KUBELET_TEST_LOG_LEVEL}"
fi
if [ -n "${KUBELET_TEST_ARGS:-}" ]; then if [ -n "${KUBELET_TEST_ARGS:-}" ]; then
ARGS="${KUBELET_TEST_ARGS}" ARGS="${ARGS} ${KUBELET_TEST_ARGS}"
fi fi
if [ ! -z "${KUBELET_APISERVER:-}" ] && [ ! -z "${KUBELET_CERT:-}" ] && [ ! -z "${KUBELET_KEY:-}" ]; then if [ ! -z "${KUBELET_APISERVER:-}" ] && [ ! -z "${KUBELET_CERT:-}" ] && [ ! -z "${KUBELET_KEY:-}" ]; then
ARGS="${ARGS} --api-servers=https://${KUBELET_APISERVER}" ARGS="${ARGS} --api-servers=https://${KUBELET_APISERVER}"
@ -155,7 +158,7 @@ script
--cgroup-root=/ \ --cgroup-root=/ \
--system-container=/system \ --system-container=/system \
--nosystemd=true \ --nosystemd=true \
${ARGS} ${ARGS} 1>>/var/log/kubelet.log 2>&1
end script end script
# Wait for 10s to start kubelet again. # Wait for 10s to start kubelet again.

14
cluster/gce/trusty/node.yaml
View File

@ -121,8 +121,11 @@ script
. /etc/kube-env . /etc/kube-env
ARGS="--v=2" ARGS="--v=2"
if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
ARGS="${KUBELET_TEST_LOG_LEVEL}"
fi
if [ -n "${KUBELET_TEST_ARGS:-}" ]; then if [ -n "${KUBELET_TEST_ARGS:-}" ]; then
ARGS="${KUBELET_TEST_ARGS}" ARGS="${ARGS} ${KUBELET_TEST_ARGS}"
fi fi
BINARY_PATH="/usr/bin/kubelet" BINARY_PATH="/usr/bin/kubelet"
if [ "${TEST_CLUSTER:-}" = "true" ]; then if [ "${TEST_CLUSTER:-}" = "true" ]; then
@ -140,7 +143,7 @@ script
--cgroup-root=/ \ --cgroup-root=/ \
--system-container=/system \ --system-container=/system \
--nosystemd=true \ --nosystemd=true \
${ARGS} ${ARGS} 1>>/var/log/kubelet.log 2>&1
end script end script
# Wait for 10s to start kubelet again. # Wait for 10s to start kubelet again.
@ -206,11 +209,12 @@ script
fi fi
kube_proxy_docker_tag=$(cat /run/kube-docker-files/kube-proxy.docker_tag) kube_proxy_docker_tag=$(cat /run/kube-docker-files/kube-proxy.docker_tag)
test_args="" test_args=""
log_level="--v=2"
if [ -n "${KUBEPROXY_TEST_ARGS:-}" ]; then if [ -n "${KUBEPROXY_TEST_ARGS:-}" ]; then
test_args="${KUBEPROXY_TEST_ARGS}" test_args="${KUBEPROXY_TEST_ARGS}"
# test_args should already contain log level setting. fi
log_level="" log_level="--v=2"
if [ -n "${KUBEPROXY_TEST_LOG_LEVEL:-}" ]; then
log_level="${KUBEPROXY_TEST_LOG_LEVEL}"
fi fi
api_servers="--master=https:\/\/${KUBERNETES_MASTER_NAME}" api_servers="--master=https:\/\/${KUBERNETES_MASTER_NAME}"
sed -i -e "s/{{kubeconfig}}/${kubeconfig}/g" ${tmp_file} sed -i -e "s/{{kubeconfig}}/${kubeconfig}/g" ${tmp_file}