Merge pull request #12708 from Huawei-PaaS/issue_cluster_kubernetes_auth

Replace "~/.kubernetes_auth" with "${KUBECONFIG:-$DEFAULT_KUBECONFIG}" in util.sh
This commit is contained in:
Jerzy Szczepkowski 2015-08-14 13:18:53 +02:00
commit 7296a5bd4a
4 changed files with 4 additions and 4 deletions

View File

@ -493,7 +493,7 @@ function kube-down {
# echo
# echo " https://${KUBE_MASTER_IP}"
# echo
# echo "The user name and password to use is located in ~/.kubernetes_auth."
# echo "The user name and password to use is located in ${KUBECONFIG:-$DEFAULT_KUBECONFIG}."
# echo
#}

View File

@ -371,7 +371,7 @@ kube-up() {
echo
echo " https://${KUBE_MASTER_IP}"
echo
echo "The user name and password to use is located in ~/.kubernetes_auth."
echo "The user name and password to use is located in ${KUBECONFIG:-$DEFAULT_KUBECONFIG}."
echo
echo "Security note: The server above uses a self signed certificate. This is"
echo " subject to \"Man in the middle\" type attacks."

View File

@ -261,7 +261,7 @@ EOF
}
# Ensure that we have a password created for validating to the master. Will
# read from $HOME/.kubernetes_auth if available.
# read from ${KUBECONFIG:-$DEFAULT_KUBECONFIG} if available.
#
# Vars set:
# KUBE_USER

View File

@ -441,7 +441,7 @@ function kube-push {
echo
echo " https://${KUBE_MASTER_IP}"
echo
echo "The user name and password to use is located in ~/.kubernetes_auth."
echo "The user name and password to use is located in ${KUBECONFIG:-$DEFAULT_KUBECONFIG}."
echo
}