Make libvirt-coreos generate a .kubeconfig file and have e2e tests use it

This commit is contained in:
Lénaïc Huard 2015-03-13 15:54:53 +01:00
parent 27c51ee6f5
commit efe345f8b6
2 changed files with 12 additions and 8 deletions

View File

@ -220,6 +220,13 @@ function kube-up {
rm $domain_xml
done
export KUBECONFIG="${HOME}/.kube/.kubeconfig"
local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
"${kubectl}" config set-cluster libvirt-coreos --server=http://${KUBE_MASTER_IP-}:8080
"${kubectl}" config set-context libvirt-coreos --cluster=libvirt-coreos
"${kubectl}" config use-context libvirt-coreos --cluster=libvirt-coreos
wait-cluster-readiness
echo "Kubernetes cluster is running. The master is running at:"

View File

@ -109,6 +109,10 @@ if [[ -z "${AUTH_CONFIG:-}" ]]; then
auth_config=(
"--auth_config=${HOME}/.kube/${INSTANCE_PREFIX}/kubernetes_auth"
)
elif [[ "${KUBERNETES_PROVIDER}" == "libvirt-coreos" ]]; then
auth_config=(
"--kubeconfig=${HOME}/.kube/.kubeconfig"
)
elif [[ "${KUBERNETES_PROVIDER}" == "conformance_test" ]]; then
auth_config=(
"--auth_config=${KUBERNETES_CONFORMANCE_TEST_AUTH_CONFIG:-}"
@ -117,12 +121,6 @@ if [[ -z "${AUTH_CONFIG:-}" ]]; then
else
auth_config=()
fi
if [[ "$KUBERNETES_PROVIDER" == "libvirt-coreos" ]]; then
host="http://${KUBE_MASTER_IP-}:8080"
else
host="https://${KUBE_MASTER_IP-}"
fi
else
echo "Conformance Test. No cloud-provider-specific preparation."
KUBERNETES_PROVIDER=""
@ -130,13 +128,12 @@ else
"--auth_config=${AUTH_CONFIG:-}"
"--cert_dir=${CERT_DIR:-}"
)
host="https://${KUBE_MASTER_IP-}"
fi
# Use the kubectl binary from the same directory as the e2e binary.
export PATH=$(dirname "${e2e}"):"${PATH}"
"${e2e}" "${auth_config[@]:+${auth_config[@]}}" \
--host="$host" \
--host="https://${KUBE_MASTER_IP-}" \
--provider="${KUBERNETES_PROVIDER}" \
--gce_project="${PROJECT:-}" \
--gce_zone="${ZONE:-}" \