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

add sanity checking steps and fix KUBE_MASTER_IP

pull/6/head
Ryan Richard 2014-08-29 17:40:25 -05:00
parent 0b50244c72
commit 0fed66a667
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/rackspace/kube-up.sh
View File

@ -31,6 +31,7 @@ echo "Starting cluster using provider: $KUBERNETES_PROVIDER"
verify-prereqs verify-prereqs
kube-up kube-up
source $(dirname $0)/validate-cluster.sh # skipping validation for now until since machines show up as private IPs
# source $(dirname $0)/validate-cluster.sh
echo "Done" echo "Done"

35
cluster/rackspace/util.sh
View File

@ -71,7 +71,7 @@ rax-boot-master() {
) > ${KUBE_TEMP}/masterStart.sh ) > ${KUBE_TEMP}/masterStart.sh
# Copy cloud-config to KUBE_TEMP and work some sed magic # Copy cloud-config to KUBE_TEMP and work some sed magic
sed -e "s/KUBE_MASTER/$MASTER_NAME/" \ sed -e "s/KUBE_MASTER/$MASTER_NAME/g" \
-e "s/MASTER_HTPASSWD/$HTPASSWD/" \ -e "s/MASTER_HTPASSWD/$HTPASSWD/" \
$(dirname $0)/cloud-config/master-cloud-config.yaml > $KUBE_TEMP/master-cloud-config.yaml $(dirname $0)/cloud-config/master-cloud-config.yaml > $KUBE_TEMP/master-cloud-config.yaml
@ -197,8 +197,8 @@ kube-up() {
rax-boot-master rax-boot-master
# a bit of a hack to wait until master is has an IP from the extra network # a bit of a hack to wait until master is has an IP from the extra network
echo "cluster/rackspace/util.sh: sleeping 30 seconds" echo "cluster/rackspace/util.sh: sleeping 35 seconds"
sleep 30 sleep 35
detect-master-nova-net $NOVA_NETWORK_LABEL detect-master-nova-net $NOVA_NETWORK_LABEL
rax-boot-minions rax-boot-minions
@ -213,7 +213,7 @@ kube-up() {
exit 2 exit 2
fi fi
detect-master > /dev/null detect-master
echo "Waiting for cluster initialization." echo "Waiting for cluster initialization."
echo echo
@ -223,11 +223,11 @@ kube-up() {
echo echo
#This will fail until apiserver salt is updated #This will fail until apiserver salt is updated
#until $(curl --insecure --user ${user}:${passwd} --max-time 5 \ until $(curl --insecure --user ${user}:${passwd} --max-time 5 \
# --fail --output /dev/null --silent https://${KUBE_MASTER_IP}/api/v1beta1/pods); do --fail --output /dev/null --silent https://${KUBE_MASTER_IP}/api/v1beta1/pods); do
# printf "." printf "."
# sleep 2 sleep 2
#done done
echo "Kubernetes cluster created." echo "Kubernetes cluster created."
echo "Sanity checking cluster..." echo "Sanity checking cluster..."
@ -238,25 +238,8 @@ kube-up() {
set +e set +e
sleep 45 sleep 45
#detect-minions > /dev/null
detect-minions detect-minions
#This will fail until apiserver salt is updated
# Basic sanity checking
#for (( i=0; i<${#KUBE_MINION_IP_ADDRESSES[@]}; i++)); do
#
# # Make sure the kubelet is running
# if [ "$(curl --insecure --user ${user}:${passwd} https://${KUBE_MASTER_IP}/proxy/minion/${KUBE_MINION_IP_ADDRESSES[$i]}/healthz)" != "ok" ]; then
# echo "Kubelet failed to install on ${KUBE_MINION_IP_ADDRESSES[$i]} your cluster is unlikely to work correctly"
# echo "Please run ./cluster/kube-down.sh and re-create the cluster. (sorry!)"
# exit 1
# else
# echo "Kubelet is successfully installed on ${MINION_NAMES[$i]}"
#
# fi
#
#done
echo "All minions may not be online yet, this is okay." echo "All minions may not be online yet, this is okay."
echo echo
echo "Kubernetes cluster is running. Access the master at:" echo "Kubernetes cluster is running. Access the master at:"