Load or generate auth from kubeconfig on kube-up

Allows loading existing auth from kubeconfig on kube-up if a
valid KUBE_CONTEXT is specified, instead of always force
regenerating auth (basic or token) when creating a new cluster.
This commit is contained in:
Jeff Lowdermilk
2015-10-26 10:38:53 -07:00
parent 887b9dd78a
commit de4f29f1f5
8 changed files with 51 additions and 45 deletions

View File

@@ -274,7 +274,7 @@ kube-up() {
KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
trap "rm -rf ${KUBE_TEMP}" EXIT
gen-kube-basicauth
load-or-gen-kube-basicauth
python2.7 $(dirname $0)/../third_party/htpasswd/htpasswd.py -b -c ${KUBE_TEMP}/htpasswd $KUBE_USER $KUBE_PASSWORD
HTPASSWD=$(cat ${KUBE_TEMP}/htpasswd)