Merge pull request #6823 from ArtfulCoder/scheduler-in-a-pod

cluster/saltbase/salt/kube-apiserver/init.sls

@@ -9,13 +9,6 @@
 {% endif %}
 {% endif %}
 
-/usr/local/bin/kube-apiserver:
-  file.managed:
-    - source: salt://kube-bins/kube-apiserver
-    - user: root
-    - group: root
-    - mode: 755
-
 # Copy kube-apiserver manifest to manifests folder for kubelet.
 /etc/kubernetes/manifests/kube-apiserver.manifest:
   file.managed:

cluster/saltbase/salt/kube-scheduler/default

-{% 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}} {{pillar['log_level']}}"

cluster/saltbase/salt/kube-scheduler/init.sls

-{% if grains['os_family'] == 'RedHat' %}
-{% set environment_file = '/etc/sysconfig/kube-scheduler' %}
-{% else %}
-{% set environment_file = '/etc/default/kube-scheduler' %}
-{% endif %}
-
-{{ environment_file }}:
+# Copy kube-scheduler manifest to manifests folder for kubelet.
+/etc/kubernetes/manifests/kube-scheduler.manifest:
   file.managed:
-    - source: salt://kube-scheduler/default
+    - source: salt://kube-scheduler/kube-scheduler.manifest
     - template: jinja
     - user: root
     - group: root
     - mode: 644
-
-/usr/local/bin/kube-scheduler:
-  file.managed:
-    - source: salt://kube-bins/kube-scheduler
-    - user: root
-    - group: root
-    - mode: 755
-
-{% if grains['os_family'] == 'RedHat' %}
-
-/usr/lib/systemd/system/kube-scheduler.service:
-  file.managed:
-    - source: salt://kube-scheduler/kube-scheduler.service
-    - user: root
-    - group: root
-
-{% else %}
-
-/etc/init.d/kube-scheduler:
-  file.managed:
-    - source: salt://kube-scheduler/initd
-    - user: root
-    - group: root
-    - mode: 755
-
-{% endif %}
-
-kube-scheduler:
-  group.present:
-    - system: True
-  user.present:
-    - system: True
-    - gid_from_name: True
-    - shell: /sbin/nologin
-    - home: /var/kube-scheduler
-    - require:
-      - group: kube-scheduler
-  service.running:
-    - enable: True
-    - watch:
-      - file: /usr/local/bin/kube-scheduler
-      - file: {{ environment_file }}
-{% if grains['os_family'] != 'RedHat' %}
-      - file: /etc/init.d/kube-scheduler
-{% endif %}
-
-
+    - makedirs: true
+    - dir_mode: 755
+
+#stop legacy kube-scheduler service 
+stop_kube-scheduler:
+  service.dead:
+    - name: kube-scheduler
+    - enable: None

cluster/saltbase/salt/kube-scheduler/initd

-#!/bin/bash
-#
-### BEGIN INIT INFO
-# Provides:    kube-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=kube-scheduler
-DAEMON=/usr/local/bin/kube-scheduler
-DAEMON_ARGS=" "
-DAEMON_LOG_FILE=/var/log/$NAME.log
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-DAEMON_USER=kube-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) log_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

cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest

+{
+"apiVersion": "v1beta3",
+"kind": "Pod",
+"metadata": {"name":"kube-scheduler"},
+"spec":{
+"hostNetwork": true,
+"containers":[
+    {
+    "name": "kube-scheduler",
+    "image": "gcr.io/google_containers/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
+    "command": [
+                 "/kube-scheduler",
+                 "--master=127.0.0.1:8080",
+                 "{{pillar['log_level']}}"
+               ]
+    }
+]
+}}

cluster/saltbase/salt/kube-scheduler/kube-scheduler.service

-[Unit]
-Description=Kubernetes Scheduler Plugin
-Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/sysconfig/kube-scheduler
-ExecStart=/usr/local/bin/kube-scheduler "$DAEMON_ARGS"
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target