Merge pull request #1429 from brendandburns/auth

Fix the scripts. (Again)
This commit is contained in:
Tim Hockin 2014-09-24 11:12:09 -07:00
commit 9564dacf6c

View File

@ -259,20 +259,25 @@ function kube-up {
kube_key=".kubecfg.key" kube_key=".kubecfg.key"
ca_cert=".kubernetes.ca.crt" ca_cert=".kubernetes.ca.crt"
(umask 077 && gcutil pull "${MASTER_NAME}" /usr/share/nginx/kubecfg.crt "${HOME}/${kube_cert}" && chmod 0600 "${HOME}/${kube_cert}") (umask 077
(umask 077 && gcutil pull "${MASTER_NAME}" /usr/share/nginx/kubecfg.key "${HOME}/${kube_key}" && chmod 0600 "${HOME}/${kube_key}") gcutil ssh "${MASTER_NAME}" sudo cat /usr/share/nginx/kubecfg.crt > "${HOME}/${kube_cert}"
(umask 077 && gcutil pull "${MASTER_NAME}" /usr/share/nginx/ca.crt "${HOME}/${ca_cert}" && chmod 0600 "${HOME}/${ca_cert}") gcutil ssh "${MASTER_NAME}" sudo cat /usr/share/nginx/kubecfg.key > "${HOME}/${kube_key}"
(umask 077 gcutil ssh "${MASTER_NAME}" sudo cat /usr/share/nginx/ca.crt > "${HOME}/${ca_cert}"
cat << EOF > ~/.kubernetes_auth cat << EOF > ~/.kubernetes_auth
{ {
"User": "$user", "User": "$user",
"Password": "$passwd", "Password": "$passwd",
"CAFile": "$HOME/$ca_crt", "CAFile": "$HOME/$ca_cert",
"CertFile": "$HOME/$kube_crt", "CertFile": "$HOME/$kube_cert",
"KeyFile": "$HOME/$kube_key", "KeyFile": "$HOME/$kube_key"
} }
EOF EOF
chmod 0600 ~/.kubernetes_auth)
chmod 0600 ~/.kubernetes_auth
chmod 0600 "${HOME}/${kube_cert}"
chmod 0600 "${HOME}/${kube_key}"
chmod 0600 "${HOME}/${ca_cert}")
} }
# Delete a kubernetes cluster # Delete a kubernetes cluster