github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix vagrant cluster/kube-up

Browse Source
This commit is contained in:
derekwaynecarr 2015-02-16 18:34:50 -05:00
parent 64678b71f3
commit a0cb252d40
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/kubectl.sh
View File

@ -113,14 +113,13 @@ if [[ "$KUBERNETES_PROVIDER" == "gke" ]]; then
"--cluster=${CLUSTER_NAME}" "--cluster=${CLUSTER_NAME}"
) )
elif [[ "$KUBERNETES_PROVIDER" == "vagrant" ]]; then elif [[ "$KUBERNETES_PROVIDER" == "vagrant" ]]; then
# When we are using vagrant it has hard coded auth. We repeat that here so that # When we are using vagrant it has hard coded kubeconfig, and do not clobber public endpoints
# we don't clobber auth that might be used for a publicly facing cluster.
config=( config=(
"--auth-path=$HOME/.kubernetes_vagrant_auth" "--kubeconfig=$HOME/.kubernetes_vagrant_kubeconfig"
) )
fi fi
echo "current-context: \"$(${kubectl} config view -o template --template='{{index . "current-context"}}')\"" >&2 echo "current-context: \"$(${kubectl} "${config[@]:+${config[@]}}" config view -o template --template='{{index . "current-context"}}')\"" >&2
echo "Running:" "${kubectl}" "${config[@]:+${config[@]}}" "${@+$@}" >&2 echo "Running:" "${kubectl}" "${config[@]:+${config[@]}}" "${@+$@}" >&2
"${kubectl}" "${config[@]:+${config[@]}}" "${@+$@}" "${kubectl}" "${config[@]:+${config[@]}}" "${@+$@}"

23
cluster/vagrant/util.sh
View File

@ -163,7 +163,7 @@ function verify-cluster {
local count="0" local count="0"
until [[ "$count" == "1" ]]; do until [[ "$count" == "1" ]]; do
local minions local minions
minions=$("${KUBE_ROOT}/cluster/kubectl.sh" get minions -o template -t '{{range.items}}{{.id}}:{{end}}') minions=$("${KUBE_ROOT}/cluster/kubectl.sh --kubeconfig=${HOME}/.kubernetes_vagrant_kubeconfig" get minions -o template -t '{{range.items}}{{.id}}:{{end}}')
count=$(echo $minions | grep -c "${MINION_IPS[i]}") || { count=$(echo $minions | grep -c "${MINION_IPS[i]}") || {
printf "." printf "."
sleep 2 sleep 2
@ -210,6 +210,27 @@ function kube-up {
} }
EOF EOF
cat <<EOF >"${HOME}/.kubernetes_vagrant_kubeconfig"
apiVersion: v1
clusters:
- cluster:
server: https://${MASTER_IP}:443
name: vagrant
contexts:
- context:
cluster: vagrant
namespace: default
user: vagrant
name: vagrant
current-context: "vagrant"
kind: Config
preferences: {}
users:
- name: vagrant
user:
auth-path: ${HOME}/.kubernetes_vagrant_auth
EOF
chmod 0600 ~/.kubernetes_vagrant_auth "${HOME}/${kube_cert}" \ chmod 0600 ~/.kubernetes_vagrant_auth "${HOME}/${kube_cert}" \
"${HOME}/${kube_key}" "${HOME}/${ca_cert}" "${HOME}/${kube_key}" "${HOME}/${ca_cert}"
) )