mirror of https://github.com/k3s-io/k3s
Improved user experience for users of OpenStack provider behind a proxy.
parent
8315734bab
commit
4773808767
|
@ -64,6 +64,15 @@ elif [[ "${validate_result}" == "2" ]]; then
|
|||
echo "...ignoring non-fatal errors in validate-cluster" >&2
|
||||
fi
|
||||
|
||||
if [[ "${ENABLE_PROXY:-}" == "true" ]]; then
|
||||
. /tmp/kube-proxy-env
|
||||
echo ""
|
||||
echo "*** Please run the following to add the kube-apiserver endpoint to your proxy white-list ***"
|
||||
cat /tmp/kube-proxy-env
|
||||
echo "*** ***"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
echo -e "Done, listing cluster services:\n" >&2
|
||||
"${KUBE_ROOT}/cluster/kubectl.sh" cluster-info
|
||||
echo
|
||||
|
|
|
@ -233,6 +233,13 @@ function configure-kubectl() {
|
|||
export KUBE_MASTER_IP=$(nova show "${STACK_NAME}"-master | awk '$3=="network" {print $6}')
|
||||
export CONTEXT="openstack-${STACK_NAME}"
|
||||
export KUBE_BEARER_TOKEN="TokenKubelet"
|
||||
|
||||
if [[ "${ENABLE_PROXY:-}" == "true" ]]; then
|
||||
echo 'export NO_PROXY=$NO_PROXY,'"${KUBE_MASTER_IP}" > /tmp/kube-proxy-env
|
||||
echo 'export no_proxy=$NO_PROXY,'"${KUBE_MASTER_IP}" >> /tmp/kube-proxy-env
|
||||
. /tmp/kube-proxy-env
|
||||
fi
|
||||
|
||||
create-kubeconfig
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue