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

Merge pull request #8005 from lavalamp/kubectlFix 

Don't print debugging things on every run of kubectl.sh
pull/6/head
Nikhil Jindal 2015-05-11 10:19:37 -07:00
parent 48dfad6701 ccecb115ed
commit 72ac82eba9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/gce/util.sh
View File

@ -23,11 +23,10 @@ source "${KUBE_ROOT}/cluster/gce/${KUBE_CONFIG_FILE-"config-default.sh"}"
source "${KUBE_ROOT}/cluster/common.sh"
if [[ "${OS_DISTRIBUTION}" == "debian" || "${OS_DISTRIBUTION}" == "coreos" ]]; then
echo "Starting cluster using os distro: ${OS_DISTRIBUTION}" >&2
source "${KUBE_ROOT}/cluster/gce/${OS_DISTRIBUTION}/helper.sh"
else
echo "Cannot start cluster using os distro: ${OS_DISTRIBUTION}" >&2
return
echo "Cannot operate on cluster using os distro: ${OS_DISTRIBUTION}" >&2
exit 1
fi
NODE_INSTANCE_PREFIX="${INSTANCE_PREFIX}-minion"

8
cluster/kubectl.sh
View File

@ -121,7 +121,11 @@ elif [[ "$KUBERNETES_PROVIDER" == "ubuntu" ]]; then
)
fi
echo "current-context: \"$(${kubectl} "${config[@]:+${config[@]}}" config view -o template --template='{{index . "current-context"}}')\"" >&2
echo "Running:" "${kubectl}" "${config[@]:+${config[@]}}" "${@+$@}" >&2
if false; then
# disable these debugging messages by default
echo "current-context: \"$(${kubectl} "${config[@]:+${config[@]}}" config view -o template --template='{{index . "current-context"}}')\"" >&2
echo "Running:" "${kubectl}" "${config[@]:+${config[@]}}" "${@+$@}" >&2
fi
"${kubectl}" "${config[@]:+${config[@]}}" "${@+$@}"