Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
#!/bin/bash
|
|
|
|
|
|
|
|
# Copyright 2015 Google Inc. All rights reserved.
|
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
# limitations under the License.
|
|
|
|
|
|
|
|
set -o errexit
|
|
|
|
set -o nounset
|
|
|
|
set -o pipefail
|
|
|
|
|
|
|
|
# If we have any arguments at all, this is a push and not just setup.
|
|
|
|
is_push=$@
|
|
|
|
|
2015-04-03 21:48:39 +00:00
|
|
|
readonly KNOWN_TOKENS_FILE="/srv/salt-overlay/salt/kube-apiserver/known_tokens.csv"
|
|
|
|
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
function ensure-install-dir() {
|
|
|
|
INSTALL_DIR="/var/cache/kubernetes-install"
|
|
|
|
mkdir -p ${INSTALL_DIR}
|
|
|
|
cd ${INSTALL_DIR}
|
|
|
|
}
|
|
|
|
|
|
|
|
function set-broken-motd() {
|
|
|
|
echo -e '\nBroken (or in progress) GCE Kubernetes node setup! Suggested first step:\n tail /var/log/startupscript.log\n' > /etc/motd
|
|
|
|
}
|
|
|
|
|
|
|
|
function set-good-motd() {
|
|
|
|
echo -e '\n=== GCE Kubernetes node setup complete ===\n' > /etc/motd
|
|
|
|
}
|
|
|
|
|
|
|
|
function curl-metadata() {
|
|
|
|
curl --fail --silent -H 'Metadata-Flavor: Google' "http://metadata/computeMetadata/v1/instance/attributes/${1}"
|
|
|
|
}
|
|
|
|
|
|
|
|
function set-kube-env() {
|
|
|
|
local kube_env_yaml="${INSTALL_DIR}/kube_env.yaml"
|
|
|
|
|
|
|
|
until curl-metadata kube-env > "${kube_env_yaml}"; do
|
|
|
|
echo 'Waiting for kube-env...'
|
|
|
|
sleep 3
|
|
|
|
done
|
|
|
|
|
|
|
|
# kube-env has all the environment variables we care about, in a flat yaml format
|
|
|
|
eval $(python -c '''
|
|
|
|
import pipes,sys,yaml
|
|
|
|
|
|
|
|
for k,v in yaml.load(sys.stdin).iteritems():
|
|
|
|
print "readonly {var}={value}".format(var = k, value = pipes.quote(str(v)))
|
|
|
|
''' < "${kube_env_yaml}")
|
|
|
|
|
2015-03-12 17:57:38 +00:00
|
|
|
# Infer master status from presence in node pool
|
|
|
|
if [[ $(hostname) = ${NODE_INSTANCE_PREFIX}* ]]; then
|
|
|
|
KUBERNETES_MASTER="false"
|
|
|
|
else
|
|
|
|
KUBERNETES_MASTER="true"
|
|
|
|
fi
|
|
|
|
|
2015-03-27 21:44:19 +00:00
|
|
|
if [[ "${KUBERNETES_MASTER}" != "true" ]] && [[ -z "${MINION_IP_RANGE:-}" ]]; then
|
|
|
|
# This block of code should go away once the master can allocate CIDRs
|
|
|
|
until MINION_IP_RANGE=$(curl-metadata node-ip-range); do
|
|
|
|
echo 'Waiting for metadata MINION_IP_RANGE...'
|
|
|
|
sleep 3
|
|
|
|
done
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2015-04-21 16:09:45 +00:00
|
|
|
function ensure-kube-tokens() {
|
2015-04-03 21:48:39 +00:00
|
|
|
# We bake the KUBELET_TOKEN in separately to avoid auth information
|
|
|
|
# having to be re-communicated on kube-push. (Otherwise the client
|
|
|
|
# has to keep the bearer token around to handle generating a valid
|
|
|
|
# kube-env.)
|
|
|
|
if [[ -z "${KUBELET_TOKEN:-}" ]] && [[ ! -e "${KNOWN_TOKENS_FILE}" ]]; then
|
2015-04-21 16:09:45 +00:00
|
|
|
until KUBELET_TOKEN=$(curl-metadata kubelet-token); do
|
2015-04-03 21:48:39 +00:00
|
|
|
echo 'Waiting for metadata KUBELET_TOKEN...'
|
|
|
|
sleep 3
|
|
|
|
done
|
|
|
|
fi
|
2015-04-21 16:09:45 +00:00
|
|
|
if [[ -z "${KUBE_PROXY_TOKEN:-}" ]] && [[ ! -e "${KNOWN_TOKENS_FILE}" ]]; then
|
|
|
|
until KUBE_PROXY_TOKEN=$(curl-metadata kube-proxy-token); do
|
|
|
|
echo 'Waiting for metadata KUBE_PROXY_TOKEN...'
|
|
|
|
sleep 3
|
|
|
|
done
|
|
|
|
fi
|
2015-04-03 21:48:39 +00:00
|
|
|
}
|
|
|
|
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
function remove-docker-artifacts() {
|
2015-03-29 20:58:14 +00:00
|
|
|
echo "== Deleting docker0 =="
|
|
|
|
# Forcibly install bridge-utils (options borrowed from Salt logs).
|
|
|
|
until apt-get -q -y -o DPkg::Options::=--force-confold -o DPkg::Options::=--force-confdef install bridge-utils; do
|
|
|
|
echo "== install of bridge-utils failed, retrying =="
|
|
|
|
sleep 5
|
|
|
|
done
|
|
|
|
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
# Remove docker artifacts on minion nodes, if present
|
|
|
|
iptables -t nat -F || true
|
|
|
|
ifconfig docker0 down || true
|
|
|
|
brctl delbr docker0 || true
|
2015-03-29 20:58:14 +00:00
|
|
|
echo "== Finished deleting docker0 =="
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
# Retry a download until we get it.
|
|
|
|
#
|
|
|
|
# $1 is the URL to download
|
|
|
|
download-or-bust() {
|
|
|
|
local -r url="$1"
|
|
|
|
local -r file="${url##*/}"
|
|
|
|
rm -f "$file"
|
2015-04-02 00:40:19 +00:00
|
|
|
until curl --ipv4 -Lo "$file" --connect-timeout 20 --retry 6 --retry-delay 10 "$1"; do
|
|
|
|
echo "Failed to download file ($1). Retrying."
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
# Install salt from GCS. See README.md for instructions on how to update these
|
|
|
|
# debs.
|
|
|
|
install-salt() {
|
2015-03-24 23:11:40 +00:00
|
|
|
echo "== Refreshing package database =="
|
|
|
|
until apt-get update; do
|
|
|
|
echo "== apt-get update failed, retrying =="
|
|
|
|
echo sleep 5
|
|
|
|
done
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
|
|
|
|
mkdir -p /var/cache/salt-install
|
|
|
|
cd /var/cache/salt-install
|
|
|
|
|
2015-03-24 23:11:40 +00:00
|
|
|
DEBS=(
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
libzmq3_3.2.3+dfsg-1~bpo70~dst+1_amd64.deb
|
|
|
|
python-zmq_13.1.0-1~bpo70~dst+1_amd64.deb
|
|
|
|
salt-common_2014.1.13+ds-1~bpo70+1_all.deb
|
|
|
|
salt-minion_2014.1.13+ds-1~bpo70+1_all.deb
|
|
|
|
)
|
|
|
|
URL_BASE="https://storage.googleapis.com/kubernetes-release/salt"
|
|
|
|
|
2015-03-24 23:11:40 +00:00
|
|
|
for deb in "${DEBS[@]}"; do
|
2015-04-17 19:05:01 +00:00
|
|
|
if [ ! -e "${deb}" ]; then
|
|
|
|
download-or-bust "${URL_BASE}/${deb}"
|
|
|
|
fi
|
2015-03-24 23:11:40 +00:00
|
|
|
done
|
|
|
|
|
2015-03-18 23:11:10 +00:00
|
|
|
# Based on
|
|
|
|
# https://major.io/2014/06/26/install-debian-packages-without-starting-daemons/
|
|
|
|
# We do this to prevent Salt from starting the salt-minion
|
|
|
|
# daemon. The other packages don't have relevant daemons. (If you
|
|
|
|
# add a package that needs a daemon started, add it to a different
|
|
|
|
# list.)
|
|
|
|
cat > /usr/sbin/policy-rc.d <<EOF
|
|
|
|
#!/bin/sh
|
|
|
|
echo "Salt shall not start." >&2
|
|
|
|
exit 101
|
|
|
|
EOF
|
|
|
|
chmod 0755 /usr/sbin/policy-rc.d
|
|
|
|
|
2015-03-24 23:11:40 +00:00
|
|
|
for deb in "${DEBS[@]}"; do
|
|
|
|
echo "== Installing ${deb}, ignore dependency complaints (will fix later) =="
|
2015-04-17 19:05:01 +00:00
|
|
|
dpkg --skip-same-version --force-depends -i "${deb}"
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
done
|
|
|
|
|
|
|
|
# This will install any of the unmet dependencies from above.
|
2015-03-24 23:11:40 +00:00
|
|
|
echo "== Installing unmet dependencies =="
|
|
|
|
until apt-get install -f -y; do
|
|
|
|
echo "== apt-get install failed, retrying =="
|
|
|
|
echo sleep 5
|
|
|
|
done
|
2015-03-18 23:11:10 +00:00
|
|
|
|
|
|
|
rm /usr/sbin/policy-rc.d
|
2015-03-29 20:58:14 +00:00
|
|
|
|
|
|
|
# Log a timestamp
|
|
|
|
echo "== Finished installing Salt =="
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
}
|
|
|
|
|
2015-03-18 23:11:10 +00:00
|
|
|
# Ensure salt-minion never runs
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
stop-salt-minion() {
|
|
|
|
# This ensures it on next reboot
|
|
|
|
echo manual > /etc/init/salt-minion.override
|
2015-04-17 19:05:01 +00:00
|
|
|
update-rc.d salt-minion disable
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
|
2015-03-18 23:11:10 +00:00
|
|
|
if service salt-minion status >/dev/null; then
|
|
|
|
echo "salt-minion started in defiance of runlevel policy, aborting startup." >&2
|
|
|
|
return 1
|
|
|
|
fi
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
# Mounts a persistent disk (formatting if needed) to store the persistent data
|
|
|
|
# on the master -- etcd's data, a few settings, and security certs/keys/tokens.
|
|
|
|
#
|
|
|
|
# This function can be reused to mount an existing PD because all of its
|
|
|
|
# operations modifying the disk are idempotent -- safe_format_and_mount only
|
|
|
|
# formats an unformatted disk, and mkdir -p will leave a directory be if it
|
|
|
|
# already exists.
|
|
|
|
mount-master-pd() {
|
2015-03-12 02:57:18 +00:00
|
|
|
# TODO(zmerlynn): GKE is still lagging in master-pd creation
|
|
|
|
if [[ ! -e /dev/disk/by-id/google-master-pd ]]; then
|
|
|
|
return
|
|
|
|
fi
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
device_info=$(ls -l /dev/disk/by-id/google-master-pd)
|
|
|
|
relative_path=${device_info##* }
|
|
|
|
device_path="/dev/disk/by-id/${relative_path}"
|
|
|
|
|
|
|
|
# Format and mount the disk, create directories on it for all of the master's
|
|
|
|
# persistent data, and link them to where they're used.
|
|
|
|
mkdir -p /mnt/master-pd
|
|
|
|
/usr/share/google/safe_format_and_mount -m "mkfs.ext4 -F" "${device_path}" /mnt/master-pd
|
|
|
|
# Contains all the data stored in etcd
|
|
|
|
mkdir -m 700 -p /mnt/master-pd/var/etcd
|
|
|
|
# Contains the dynamically generated apiserver auth certs and keys
|
|
|
|
mkdir -p /mnt/master-pd/srv/kubernetes
|
|
|
|
# Contains the cluster's initial config parameters and auth tokens
|
|
|
|
mkdir -p /mnt/master-pd/srv/salt-overlay
|
2015-04-17 19:05:01 +00:00
|
|
|
|
|
|
|
ln -s -f /mnt/master-pd/var/etcd /var/etcd
|
|
|
|
ln -s -f /mnt/master-pd/srv/kubernetes /srv/kubernetes
|
|
|
|
ln -s -f /mnt/master-pd/srv/salt-overlay /srv/salt-overlay
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
|
|
|
|
# This is a bit of a hack to get around the fact that salt has to run after the
|
|
|
|
# PD and mounted directory are already set up. We can't give ownership of the
|
|
|
|
# directory to etcd until the etcd user and group exist, but they don't exist
|
|
|
|
# until salt runs if we don't create them here. We could alternatively make the
|
|
|
|
# permissions on the directory more permissive, but this seems less bad.
|
2015-04-17 19:05:01 +00:00
|
|
|
if ! id etcd &>/dev/null; then
|
|
|
|
useradd -s /sbin/nologin -d /var/etcd etcd
|
|
|
|
fi
|
|
|
|
chown -R etcd /mnt/master-pd/var/etcd
|
|
|
|
chgrp -R etcd /mnt/master-pd/var/etcd
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
# Create the overlay files for the salt tree. We create these in a separate
|
|
|
|
# place so that we can blow away the rest of the salt configs on a kube-push and
|
|
|
|
# re-apply these.
|
|
|
|
function create-salt-pillar() {
|
|
|
|
# Always overwrite the cluster-params.sls (even on a push, we have
|
|
|
|
# these variables)
|
|
|
|
mkdir -p /srv/salt-overlay/pillar
|
|
|
|
cat <<EOF >/srv/salt-overlay/pillar/cluster-params.sls
|
|
|
|
instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
|
|
|
|
node_instance_prefix: '$(echo "$NODE_INSTANCE_PREFIX" | sed -e "s/'/''/g")'
|
|
|
|
portal_net: '$(echo "$PORTAL_NET" | sed -e "s/'/''/g")'
|
|
|
|
enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")'
|
|
|
|
enable_node_monitoring: '$(echo "$ENABLE_NODE_MONITORING" | sed -e "s/'/''/g")'
|
|
|
|
enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")'
|
|
|
|
enable_node_logging: '$(echo "$ENABLE_NODE_LOGGING" | sed -e "s/'/''/g")'
|
|
|
|
logging_destination: '$(echo "$LOGGING_DESTINATION" | sed -e "s/'/''/g")'
|
|
|
|
elasticsearch_replicas: '$(echo "$ELASTICSEARCH_LOGGING_REPLICAS" | sed -e "s/'/''/g")'
|
|
|
|
enable_cluster_dns: '$(echo "$ENABLE_CLUSTER_DNS" | sed -e "s/'/''/g")'
|
|
|
|
dns_replicas: '$(echo "$DNS_REPLICAS" | sed -e "s/'/''/g")'
|
|
|
|
dns_server: '$(echo "$DNS_SERVER_IP" | sed -e "s/'/''/g")'
|
|
|
|
dns_domain: '$(echo "$DNS_DOMAIN" | sed -e "s/'/''/g")'
|
2015-03-12 02:57:18 +00:00
|
|
|
admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")'
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
EOF
|
|
|
|
}
|
|
|
|
|
2015-04-03 21:48:39 +00:00
|
|
|
# This should only happen on cluster initialization. Uses
|
|
|
|
# MASTER_HTPASSWORD to generate the nginx/htpasswd file, and the
|
2015-04-21 16:09:45 +00:00
|
|
|
# KUBELET_TOKEN and KUBE_PROXY_TOKEN, to generate known_tokens.csv
|
2015-04-03 21:48:39 +00:00
|
|
|
# (KNOWN_TOKENS_FILE). After the first boot and on upgrade, these
|
|
|
|
# files exist on the master-pd and should never be touched again
|
|
|
|
# (except perhaps an additional service account, see NB below.)
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
function create-salt-auth() {
|
2015-04-03 21:48:39 +00:00
|
|
|
local -r htpasswd_file="/srv/salt-overlay/salt/nginx/htpasswd"
|
|
|
|
|
|
|
|
if [ ! -e "${htpasswd_file}" ]; then
|
|
|
|
mkdir -p /srv/salt-overlay/salt/nginx
|
|
|
|
echo "${MASTER_HTPASSWD}" > "${htpasswd_file}"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ ! -e "${KNOWN_TOKENS_FILE}" ]; then
|
|
|
|
mkdir -p /srv/salt-overlay/salt/kube-apiserver
|
2015-04-21 16:09:45 +00:00
|
|
|
(umask 077; echo "" > "${KNOWN_TOKENS_FILE}")
|
|
|
|
echo "${KUBELET_TOKEN},kubelet,kubelet" >> "${KNOWN_TOKENS_FILE}"
|
|
|
|
echo "${KUBE_PROXY_TOKEN},kube_proxy,kube_proxy" >> "${KNOWN_TOKENS_FILE}"
|
2015-04-03 21:48:39 +00:00
|
|
|
|
|
|
|
mkdir -p /srv/salt-overlay/salt/kubelet
|
|
|
|
kubelet_auth_file="/srv/salt-overlay/salt/kubelet/kubernetes_auth"
|
|
|
|
(umask 077;
|
|
|
|
echo "{\"BearerToken\": \"${KUBELET_TOKEN}\", \"Insecure\": true }" > "${kubelet_auth_file}")
|
|
|
|
|
|
|
|
# Generate tokens for other "service accounts". Append to known_tokens.
|
|
|
|
#
|
|
|
|
# NB: If this list ever changes, this script actually has to
|
|
|
|
# change to detect the existence of this file, kill any deleted
|
|
|
|
# old tokens and add any new tokens (to handle the upgrade case).
|
|
|
|
local -r service_accounts=("system:scheduler" "system:controller_manager" "system:logging" "system:monitoring" "system:dns")
|
|
|
|
for account in "${service_accounts[@]}"; do
|
|
|
|
token=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null)
|
|
|
|
echo "${token},${account},${account}" >> "${KNOWN_TOKENS_FILE}"
|
|
|
|
done
|
|
|
|
fi
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function download-release() {
|
2015-04-17 19:05:01 +00:00
|
|
|
# TODO(zmerlynn): We should optimize for the reboot case here, but
|
|
|
|
# unlike the .debs, we don't have version information in the
|
|
|
|
# filenames here, nor do the URLs even provide useful information in
|
|
|
|
# the dev environment case (because they're just a project
|
|
|
|
# bucket). We should probably push a hash into the kube-env, and
|
|
|
|
# store it when we download, and then when it's different infer that
|
|
|
|
# a push occurred (otherwise it's a simple reboot).
|
|
|
|
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
echo "Downloading binary release tar ($SERVER_BINARY_TAR_URL)"
|
|
|
|
download-or-bust "$SERVER_BINARY_TAR_URL"
|
|
|
|
|
2015-03-26 21:37:51 +00:00
|
|
|
echo "Downloading Salt tar ($SALT_TAR_URL)"
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
download-or-bust "$SALT_TAR_URL"
|
|
|
|
|
|
|
|
echo "Unpacking Salt tree"
|
|
|
|
rm -rf kubernetes
|
|
|
|
tar xzf "${SALT_TAR_URL##*/}"
|
|
|
|
|
|
|
|
echo "Running release install script"
|
|
|
|
sudo kubernetes/saltbase/install.sh "${SERVER_BINARY_TAR_URL##*/}"
|
|
|
|
}
|
|
|
|
|
|
|
|
function fix-apt-sources() {
|
|
|
|
sed -i -e "\|^deb.*http://http.debian.net/debian| s/^/#/" /etc/apt/sources.list
|
|
|
|
sed -i -e "\|^deb.*http://ftp.debian.org/debian| s/^/#/" /etc/apt/sources.list.d/backports.list
|
|
|
|
}
|
|
|
|
|
|
|
|
function salt-run-local() {
|
|
|
|
cat <<EOF >/etc/salt/minion.d/local.conf
|
|
|
|
file_client: local
|
|
|
|
file_roots:
|
|
|
|
base:
|
|
|
|
- /srv/salt
|
|
|
|
EOF
|
|
|
|
}
|
|
|
|
|
|
|
|
function salt-debug-log() {
|
|
|
|
cat <<EOF >/etc/salt/minion.d/log-level-debug.conf
|
|
|
|
log_level: debug
|
|
|
|
log_level_logfile: debug
|
|
|
|
EOF
|
|
|
|
}
|
|
|
|
|
|
|
|
function salt-master-role() {
|
|
|
|
cat <<EOF >/etc/salt/minion.d/grains.conf
|
|
|
|
grains:
|
|
|
|
roles:
|
|
|
|
- kubernetes-master
|
2015-03-12 17:37:30 +00:00
|
|
|
cbr-cidr: ${MASTER_IP_RANGE}
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
cloud: gce
|
|
|
|
EOF
|
2015-03-31 16:41:27 +00:00
|
|
|
if ! [[ -z "${PROJECT_ID:-}" ]] && ! [[ -z "${TOKEN_URL:-}" ]]; then
|
|
|
|
cat <<EOF >/etc/gce.conf
|
|
|
|
[global]
|
|
|
|
token-url = ${TOKEN_URL}
|
|
|
|
project-id = ${PROJECT_ID}
|
|
|
|
EOF
|
|
|
|
cat <<EOF >>/etc/salt/minion.d/grains.conf
|
|
|
|
cloud_config: /etc/gce.conf
|
|
|
|
EOF
|
|
|
|
fi
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function salt-node-role() {
|
|
|
|
cat <<EOF >/etc/salt/minion.d/grains.conf
|
|
|
|
grains:
|
|
|
|
roles:
|
|
|
|
- kubernetes-pool
|
|
|
|
cbr-cidr: '$(echo "$MINION_IP_RANGE" | sed -e "s/'/''/g")'
|
|
|
|
cloud: gce
|
|
|
|
EOF
|
|
|
|
}
|
|
|
|
|
|
|
|
function salt-docker-opts() {
|
|
|
|
DOCKER_OPTS=""
|
|
|
|
|
|
|
|
if [[ -n "${EXTRA_DOCKER_OPTS-}" ]]; then
|
|
|
|
DOCKER_OPTS="${EXTRA_DOCKER_OPTS}"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Decide whether to enable the cache
|
|
|
|
if [[ "${ENABLE_DOCKER_REGISTRY_CACHE}" == "true" ]]; then
|
|
|
|
REGION=$(echo "${ZONE}" | cut -f 1,2 -d -)
|
|
|
|
echo "Enable docker registry cache at region: " $REGION
|
|
|
|
DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror='https://${REGION}.docker-cache.clustermaster.net'"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [[ -n "{DOCKER_OPTS}" ]]; then
|
|
|
|
cat <<EOF >>/etc/salt/minion.d/grains.conf
|
|
|
|
docker_opts: '$(echo "$DOCKER_OPTS" | sed -e "s/'/''/g")'
|
|
|
|
EOF
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
function salt-set-apiserver() {
|
2015-03-28 20:44:45 +00:00
|
|
|
local kube_master_fqdn
|
|
|
|
until kube_master_fqdn=$(getent hosts ${KUBERNETES_MASTER_NAME} | awk '{ print $2 }'); do
|
2015-03-10 15:59:19 +00:00
|
|
|
echo 'Waiting for DNS resolution of ${KUBERNETES_MASTER_NAME}...'
|
|
|
|
sleep 3
|
|
|
|
done
|
|
|
|
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
cat <<EOF >>/etc/salt/minion.d/grains.conf
|
2015-03-28 20:44:45 +00:00
|
|
|
api_servers: '${kube_master_fqdn}'
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
EOF
|
|
|
|
}
|
|
|
|
|
|
|
|
function configure-salt() {
|
|
|
|
fix-apt-sources
|
|
|
|
mkdir -p /etc/salt/minion.d
|
|
|
|
salt-run-local
|
|
|
|
if [[ "${KUBERNETES_MASTER}" == "true" ]]; then
|
|
|
|
salt-master-role
|
|
|
|
else
|
|
|
|
salt-node-role
|
|
|
|
salt-docker-opts
|
|
|
|
salt-set-apiserver
|
|
|
|
fi
|
|
|
|
install-salt
|
|
|
|
stop-salt-minion
|
|
|
|
}
|
|
|
|
|
|
|
|
function run-salt() {
|
2015-03-29 20:58:14 +00:00
|
|
|
echo "== Calling Salt =="
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
salt-call --local state.highstate || true
|
|
|
|
}
|
|
|
|
|
|
|
|
####################################################################################
|
|
|
|
|
|
|
|
if [[ -z "${is_push}" ]]; then
|
|
|
|
echo "== kube-up node config starting =="
|
|
|
|
set-broken-motd
|
|
|
|
ensure-install-dir
|
|
|
|
set-kube-env
|
|
|
|
[[ "${KUBERNETES_MASTER}" == "true" ]] && mount-master-pd
|
2015-04-21 16:09:45 +00:00
|
|
|
ensure-kube-tokens
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
create-salt-pillar
|
|
|
|
create-salt-auth
|
|
|
|
download-release
|
|
|
|
configure-salt
|
|
|
|
remove-docker-artifacts
|
|
|
|
run-salt
|
|
|
|
set-good-motd
|
|
|
|
echo "== kube-up node config done =="
|
|
|
|
else
|
|
|
|
echo "== kube-push node config starting =="
|
|
|
|
ensure-install-dir
|
|
|
|
set-kube-env
|
|
|
|
create-salt-pillar
|
2015-03-13 01:04:36 +00:00
|
|
|
download-release
|
Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.
As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).
As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-02 22:38:58 +00:00
|
|
|
run-salt
|
|
|
|
echo "== kube-push node config done =="
|
|
|
|
fi
|