kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support master on Ubuntu Trusty 

This change support running kubernetes master on Ubuntu Trusty.
It uses pure cloud-config and shell scripts, and completely gets
rid of saltstack or the release salt tarball.
This commit is contained in:
Andy Zheng 2016-02-01 11:36:45 -08:00 committed by Mike Danese
parent e9f32808dc
commit 2c7fa3c243
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kube-addons.sh
View File

@ -23,6 +23,7 @@ ADDON_CHECK_INTERVAL_SEC=${TEST_ADDON_CHECK_INTERVAL_SEC:-600}
SYSTEM_NAMESPACE=kube-system SYSTEM_NAMESPACE=kube-system
token_dir=${TOKEN_DIR:-/srv/kubernetes} token_dir=${TOKEN_DIR:-/srv/kubernetes}
trusty_master=${TRUSTY_MASTER:-false}
function ensure_python() { function ensure_python() {
if ! python --version > /dev/null 2>&1; then if ! python --version > /dev/null 2>&1; then
@ -162,8 +163,11 @@ function load-docker-images() {
# managed result is of that. Start everything below that directory. # managed result is of that. Start everything below that directory.
echo "== Kubernetes addon manager started at $(date -Is) with ADDON_CHECK_INTERVAL_SEC=${ADDON_CHECK_INTERVAL_SEC} ==" echo "== Kubernetes addon manager started at $(date -Is) with ADDON_CHECK_INTERVAL_SEC=${ADDON_CHECK_INTERVAL_SEC} =="
# Load any images that we may need # Load any images that we may need. This is not needed for trusty master and
load-docker-images /srv/salt/kube-addons-images # the way it restarts docker daemon does not work for trusty.
if [[ "${trusty_master}" == "false" ]]; then
load-docker-images /srv/salt/kube-addons-images
fi
ensure_python ensure_python