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

hot fix for ubuntu k8s

pull/6/head
wizard 2015-06-18 13:59:27 +08:00
parent 47436683d4
commit 509c3f5b94
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cluster/ubuntu/util.sh
View File

@ -17,8 +17,6 @@
# A library of helper functions that each provider hosting Kubernetes must implement to use cluster/kube-*.sh scripts. # A library of helper functions that each provider hosting Kubernetes must implement to use cluster/kube-*.sh scripts.
set -e set -e
source "${KUBE_ROOT}/cluster/common.sh"
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR" SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR"
# use an array to record name and ip # use an array to record name and ip
@ -254,23 +252,11 @@ EOF
# KUBE_USER # KUBE_USER
# KUBE_PASSWORD # KUBE_PASSWORD
function get-password { function get-password {
local file="$HOME/.kubernetes_auth" get-kubeconfig-basicauth
if [[ -r "$file" ]]; then if [[ -z "${KUBE_USER}" || -z "${KUBE_PASSWORD}" ]]; then
KUBE_USER=$(cat "$file" | python -c 'import json,sys;print json.load(sys.stdin)["User"]')
KUBE_PASSWORD=$(cat "$file" | python -c 'import json,sys;print json.load(sys.stdin)["Password"]')
return
fi
KUBE_USER=admin KUBE_USER=admin
KUBE_PASSWORD=$(python -c 'import string,random; print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))') KUBE_PASSWORD=$(python -c 'import string,random; print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))')
fi
# Store password for reuse.
cat << EOF > "$file"
{
"User": "$KUBE_USER",
"Password": "$KUBE_PASSWORD"
}
EOF
chmod 0600 "$file"
} }
# Detect the IP for the master # Detect the IP for the master
@ -353,8 +339,14 @@ function kube-up {
verify-cluster verify-cluster
detect-master detect-master
export KUBE_MASTER_IP="${KUBE_MASTER_IP}:8080"
export CONTEXT="ubuntu" export CONTEXT="ubuntu"
export KUBE_SERVER="http://${KUBE_MASTER_IP}:8080"
source "${KUBE_ROOT}/cluster/common.sh"
# set kubernetes user and password
get-password
create-kubeconfig create-kubeconfig
} }