From 79f60da6c47ec70497af43fbd97dd35edb55eb87 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 18 Aug 2014 16:37:51 -0700 Subject: [PATCH] add salt files to make scheduler run --- cluster/saltbase/salt/scheduler/default | 6 + cluster/saltbase/salt/scheduler/init.sls | 91 +++++++++++++ cluster/saltbase/salt/scheduler/initd | 120 ++++++++++++++++++ .../saltbase/salt/scheduler/scheduler.service | 11 ++ cluster/saltbase/salt/top.sls | 1 + release/master-release-install.sh | 3 + 6 files changed, 232 insertions(+) create mode 100644 cluster/saltbase/salt/scheduler/default create mode 100644 cluster/saltbase/salt/scheduler/init.sls create mode 100644 cluster/saltbase/salt/scheduler/initd create mode 100644 cluster/saltbase/salt/scheduler/scheduler.service diff --git a/cluster/saltbase/salt/scheduler/default b/cluster/saltbase/salt/scheduler/default new file mode 100644 index 00000000000..e4a89682e62 --- /dev/null +++ b/cluster/saltbase/salt/scheduler/default @@ -0,0 +1,6 @@ +{% set daemon_args = "$DAEMON_ARGS" %} +{% if grains['os_family'] == 'RedHat' %} + {% set daemon_args = "" %} +{% endif %} +{% set master="-master=127.0.0.1:8080" %} +DAEMON_ARGS="{{daemon_args}} {{master}}" diff --git a/cluster/saltbase/salt/scheduler/init.sls b/cluster/saltbase/salt/scheduler/init.sls new file mode 100644 index 00000000000..67835e6bdbf --- /dev/null +++ b/cluster/saltbase/salt/scheduler/init.sls @@ -0,0 +1,91 @@ +{% set root = '/var/src/scheduler' %} +{% set package = 'github.com/GoogleCloudPlatform/kubernetes' %} +{% set package_dir = root + '/src/' + package %} +{% if grains['os_family'] == 'RedHat' %} +{% set environment_file = '/etc/sysconfig/scheduler' %} +{% else %} +{% set environment_file = '/etc/default/scheduler' %} +{% endif %} + +{{ package_dir }}: + file.recurse: + - source: salt://scheduler/go + - user: root + {% if grains['os_family'] == 'RedHat' %} + - group: root + {% else %} + - group: staff + {% endif %} + - dir_mode: 775 + - file_mode: 664 + - makedirs: True + - recurse: + - user + - group + - mode + +{{ environment_file }}: + file.managed: + - source: salt://scheduler/default + - template: jinja + - user: root + - group: root + - mode: 644 + +scheduler-build: + cmd.run: + - cwd: {{ root }} + - names: + - go build {{ package }}/plugin/cmd/scheduler + - env: + - PATH: {{ grains['path'] }}:/usr/local/bin + - GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace + - require: + - file: {{ package_dir }} + +/usr/local/bin/scheduler: + file.symlink: + - target: {{ root }}/scheduler + - watch: + - cmd: scheduler-build + +{% if grains['os_family'] == 'RedHat' %} + +/usr/lib/systemd/system/scheduler.service: + file.managed: + - source: salt://scheduler/scheduler.service + - user: root + - group: root + +{% else %} + +/etc/init.d/scheduler: + file.managed: + - source: salt://scheduler/initd + - user: root + - group: root + - mode: 755 + +{% endif %} + +scheduler: + group.present: + - system: True + user.present: + - system: True + - gid_from_name: True + - shell: /sbin/nologin + - home: /var/scheduler + - require: + - group: scheduler + service.running: + - enable: True + - watch: + - cmd: scheduler-build + - file: /usr/local/bin/scheduler + - file: {{ environment_file }} +{% if grains['os_family'] != 'RedHat' %} + - file: /etc/init.d/scheduler +{% endif %} + + diff --git a/cluster/saltbase/salt/scheduler/initd b/cluster/saltbase/salt/scheduler/initd new file mode 100644 index 00000000000..ddca3531368 --- /dev/null +++ b/cluster/saltbase/salt/scheduler/initd @@ -0,0 +1,120 @@ +#!/bin/bash +# +### BEGIN INIT INFO +# Provides: scheduler +# Required-Start: $local_fs $network $syslog +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: The Kubernetes scheduler plugin +# Description: +# The Kubernetes scheduler plugin is responsible for scheduling pods on +# available minions. +### END INIT INFO + + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="The Kubernetes scheduler plugin" +NAME=scheduler +DAEMON=/usr/local/bin/scheduler +DAEMON_ARGS=" --master=127.0.0.1:8080" +DAEMON_LOG_FILE=/var/log/$NAME.log +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +DAEMON_USER=scheduler + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.2-14) to ensure that this file is present +# and status_of_proc is working. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --background --no-close \ + --make-pidfile --pidfile $PIDFILE \ + --exec $DAEMON -c $DAEMON_USER --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --background --no-close \ + --make-pidfile --pidfile $PIDFILE \ + --exec $DAEMON -c $DAEMON_USER -- \ + $DAEMON_ARGS >> $DAEMON_LOG_FILE 2>&1 \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) log_end_msg 0 || exit 0 ;; + 2) verblog_end_msg 1 || exit 1 ;; + esac + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) log_end_msg 0 ;; + 2) exit 1 ;; + esac + ;; + status) + status_of_proc -p $PIDFILE "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac diff --git a/cluster/saltbase/salt/scheduler/scheduler.service b/cluster/saltbase/salt/scheduler/scheduler.service new file mode 100644 index 00000000000..ffd8562aab5 --- /dev/null +++ b/cluster/saltbase/salt/scheduler/scheduler.service @@ -0,0 +1,11 @@ +[Unit] +Description=Kubernetes Scheduler Plugin +Documentation=https://github.com/GoogleCloudPlatform/kubernetes + +[Service] +Type=simple +EnvironmentFile=-/etc/sysconfig/scheduler +ExecStart=/usr/local/bin/scheduler "$DAEMON_ARGS" + +[Install] +WantedBy=multi-user.target diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls index f6d51278e4c..2c93627410a 100644 --- a/cluster/saltbase/salt/top.sls +++ b/cluster/saltbase/salt/top.sls @@ -17,4 +17,5 @@ base: - etcd - apiserver - controller-manager + - scheduler - nginx diff --git a/release/master-release-install.sh b/release/master-release-install.sh index be87e17a838..01a0d8812b5 100755 --- a/release/master-release-install.sh +++ b/release/master-release-install.sh @@ -37,6 +37,9 @@ cp -R --preserve=mode $RELEASE_BASE/src/go/* /srv/salt/kube-proxy/go mkdir -p /srv/salt/controller-manager/go cp -R --preserve=mode $RELEASE_BASE/src/go/* /srv/salt/controller-manager/go +mkdir -p /srv/salt/scheduler/go +cp -R --preserve=mode $RELEASE_BASE/src/go/* /srv/salt/scheduler/go + mkdir -p /srv/salt/kubelet/go cp -R --preserve=mode $RELEASE_BASE/src/go/* /srv/salt/kubelet/go