github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5437 from lhuard1A/libvirt-coreos_kubeconfig

Browse Source 
Make libvirt-coreos generate a .kubeconfig file and have e2e tests use it
This commit is contained in:
Jeff Grafton 2015-03-19 10:18:03 -07:00
commit d845d49dc6
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/libvirt-coreos/util.sh
View File

@ -223,6 +223,13 @@ function kube-up {
rm $domain_xml rm $domain_xml
done 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 wait-cluster-readiness
echo "Kubernetes cluster is running. The master is running at:" echo "Kubernetes cluster is running. The master is running at:"

16
hack/ginkgo-e2e.sh
View File

@ -110,6 +110,10 @@ if [[ -z "${AUTH_CONFIG:-}" ]]; then
auth_config=( auth_config=(
"--auth_config=${HOME}/.kube/${INSTANCE_PREFIX}/kubernetes_auth" "--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 elif [[ "${KUBERNETES_PROVIDER}" == "conformance_test" ]]; then
auth_config=( auth_config=(
"--auth_config=${KUBERNETES_CONFORMANCE_TEST_AUTH_CONFIG:-}" "--auth_config=${KUBERNETES_CONFORMANCE_TEST_AUTH_CONFIG:-}"
@ -118,12 +122,6 @@ if [[ -z "${AUTH_CONFIG:-}" ]]; then
else else
auth_config=() auth_config=()
fi fi
if [[ "$KUBERNETES_PROVIDER" == "libvirt-coreos" ]]; then
host="http://${KUBE_MASTER_IP-}:8080"
else
host="https://${KUBE_MASTER_IP-}"
fi
else else
echo "Conformance Test. No cloud-provider-specific preparation." echo "Conformance Test. No cloud-provider-specific preparation."
KUBERNETES_PROVIDER="" KUBERNETES_PROVIDER=""
@ -131,13 +129,15 @@ else
"--auth_config=${AUTH_CONFIG:-}" "--auth_config=${AUTH_CONFIG:-}"
"--cert_dir=${CERT_DIR:-}" "--cert_dir=${CERT_DIR:-}"
) )
host="https://${KUBE_MASTER_IP-}"
fi fi
# Use the kubectl binary from the same directory as the e2e binary. # Use the kubectl binary from the same directory as the e2e binary.
# The --host setting is used only when providing --auth_config
# If --kubeconfig is used, the host to use is retrieved from the .kubeconfig
# file and the one provided with --host is ignored.
export PATH=$(dirname "${e2e}"):"${PATH}" export PATH=$(dirname "${e2e}"):"${PATH}"
"${e2e}" "${auth_config[@]:+${auth_config[@]}}" \ "${e2e}" "${auth_config[@]:+${auth_config[@]}}" \
--host="$host" \ --host="https://${KUBE_MASTER_IP-}" \
--provider="${KUBERNETES_PROVIDER}" \ --provider="${KUBERNETES_PROVIDER}" \
--gce_project="${PROJECT:-}" \ --gce_project="${PROJECT:-}" \
--gce_zone="${ZONE:-}" \ --gce_zone="${ZONE:-}" \