github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8232 from zmerlynn/i8196

Browse Source 
Ensure basic DNS functionality before doing real work in configure-vm.sh
This commit is contained in:
Prashanth B 2015-05-15 10:19:35 -07:00
commit 1f0b4c5e2a
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cluster/gce/configure-vm.sh
View File

@ -24,6 +24,26 @@ is_push=$@
readonly KNOWN_TOKENS_FILE="/srv/salt-overlay/salt/kube-apiserver/known_tokens.csv" readonly KNOWN_TOKENS_FILE="/srv/salt-overlay/salt/kube-apiserver/known_tokens.csv"
readonly BASIC_AUTH_FILE="/srv/salt-overlay/salt/kube-apiserver/basic_auth.csv" readonly BASIC_AUTH_FILE="/srv/salt-overlay/salt/kube-apiserver/basic_auth.csv"
function ensure-basic-networking() {
# Deal with GCE networking bring-up race. (We rely on DNS for a lot,
# and it's just not worth doing a whole lot of startup work if this
# isn't ready yet.)
until getent hosts metadata.google.internal &>/dev/null; do
echo 'Waiting for functional DNS (trying to resolve metadata.google.internal)...'
sleep 3
done
until getent hosts $(hostname -f) &>/dev/null; do
echo 'Waiting for functional DNS (trying to resolve my own FQDN)...'
sleep 3
done
until getent hosts $(hostname -i) &>/dev/null; do
echo 'Waiting for functional DNS (trying to resolve my own IP)...'
sleep 3
done
echo "Networking functional on $(hostname) ($(hostname -i))"
}
function ensure-install-dir() { function ensure-install-dir() {
INSTALL_DIR="/var/cache/kubernetes-install" INSTALL_DIR="/var/cache/kubernetes-install"
mkdir -p ${INSTALL_DIR} mkdir -p ${INSTALL_DIR}
@ -58,11 +78,11 @@ for k,v in yaml.load(sys.stdin).iteritems():
print "readonly {var}={value}".format(var = k, value = pipes.quote(str(v))) print "readonly {var}={value}".format(var = k, value = pipes.quote(str(v)))
''' < "${kube_env_yaml}") ''' < "${kube_env_yaml}")
# Infer master status from presence in node pool # Infer master status from hostname
if [[ $(hostname) = ${NODE_INSTANCE_PREFIX}* ]]; then if [[ $(hostname) == "${INSTANCE_PREFIX}-master" ]]; then
KUBERNETES_MASTER="false"
else
KUBERNETES_MASTER="true" KUBERNETES_MASTER="true"
else
KUBERNETES_MASTER="false"
fi fi
} }
@ -534,6 +554,7 @@ function run-salt() {
if [[ -z "${is_push}" ]]; then if [[ -z "${is_push}" ]]; then
echo "== kube-up node config starting ==" echo "== kube-up node config starting =="
set-broken-motd set-broken-motd
ensure-basic-networking
ensure-install-dir ensure-install-dir
set-kube-env set-kube-env
[[ "${KUBERNETES_MASTER}" == "true" ]] && mount-master-pd [[ "${KUBERNETES_MASTER}" == "true" ]] && mount-master-pd
@ -551,6 +572,7 @@ if [[ -z "${is_push}" ]]; then
echo "== kube-up node config done ==" echo "== kube-up node config done =="
else else
echo "== kube-push node config starting ==" echo "== kube-push node config starting =="
ensure-basic-networking
ensure-install-dir ensure-install-dir
set-kube-env set-kube-env
create-salt-pillar create-salt-pillar