Merge pull request #16736 from dchen1107/docker

Enable supervisord on all cloud providers and removed monit.

cluster/saltbase/salt/monit/docker

@@ -1,9 +0,0 @@
-check process docker with pidfile /var/run/docker.pid
-group docker
-start program = "/etc/init.d/docker start"
-stop program = "/etc/init.d/docker stop"
-if does not exist then restart
-if failed
-  unixsocket /var/run/docker.sock
-  protocol HTTP request "/version"
-then restart

cluster/saltbase/salt/monit/init.sls

@@ -1,62 +0,0 @@
-{% if not pillar.get('is_systemd') %}
-
-monit:
-  pkg:
-    - installed
-
-/etc/monit/conf.d/docker:
-  file:
-    - managed
-    - source: salt://monit/docker
-    - user: root
-    - group: root
-    - mode: 644
-
-/etc/monit/conf.d/kubelet:
-  file:
-    - managed
-    - source: salt://monit/kubelet
-    - user: root
-    - group: root
-    - mode: 644
-
-{% if "kubernetes-pool" in grains.get('roles', []) %}
-/etc/monit/conf.d/kube-proxy:
-  file:
-    - managed
-    - source: salt://monit/kube-proxy
-    - user: root
-    - group: root
-    - mode: 644
-{% endif %}
-
-{% if grains['roles'][0] == 'kubernetes-master' -%}
-/etc/monit/conf.d/kube-addons:
-  file:
-    - managed
-    - source: salt://monit/kube-addons
-    - user: root
-    - group: root
-    - mode: 644
-{% endif %}
-
-/etc/monit/monit_watcher.sh:
-  file.managed:
-    - source: salt://monit/monit_watcher.sh
-    - user: root
-    - group: root
-    - mode: 755
-
-crontab -l | { cat; echo "* * * * * /etc/monit/monit_watcher.sh 2>&1 | logger"; } | crontab -:
-  cmd.run:
-  - unless: crontab -l | grep "* * * * * /etc/monit/monit_watcher.sh 2>&1 | logger"
-
-monit-service:
-  service:
-    - running
-    - name: monit
-    - watch:
-      - pkg: monit
-      - file: /etc/monit/conf.d/*
-
-{% endif %}

cluster/saltbase/salt/monit/kube-addons

@@ -1,5 +0,0 @@
-check process kube-addons with pidfile /var/run/kube-addons.pid
-group kube-addons
-start program = "/etc/init.d/kube-addons start"
-stop program = "/etc/init.d/kube-addons stop"
-if does not exist then restart

cluster/saltbase/salt/monit/kube-proxy

@@ -1,11 +0,0 @@
-check process kube-proxy with pidfile /var/run/kube-proxy.pid
-group kube-proxy
-start program = "/etc/init.d/kube-proxy start"
-stop program = "/etc/init.d/kube-proxy stop"
-if does not exist then restart
-if failed
-  host 127.0.0.1
-  port 10249
-  protocol HTTP
-  request "/healthz"
-then restart

cluster/saltbase/salt/monit/kubelet

@@ -1,11 +0,0 @@
-check process kubelet with pidfile /var/run/kubelet.pid
-group kubelet
-start program = "/etc/init.d/kubelet start" with timeout 60 seconds
-stop program = "/etc/init.d/kubelet stop"
-if does not exist then restart
-if failed
-  host 127.0.0.1
-  port 10255
-  protocol HTTP
-  request "/healthz"
-then restart

cluster/saltbase/salt/monit/monit_watcher.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors 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.
-
-# This script is invoked by crond every minute to check if monit is
-# up and oom protected. If down it restarts monit; otherwise, it exits
-# after applying oom_score_adj
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-PROGNAME=monit
-FULLPATH=/usr/bin/$PROGNAME
-
-pids=$(pidof $FULLPATH)
-if [[ "${pids}" == "" ]]; then
-    service $PROGNAME start
-    sleep 10
-fi
-
-# Apply oom_score_adj: -901 to processes
-pids=$(pidof $FULLPATH)
-for pid in "${pids}"; do
-    echo -901 > /proc/$pid/oom_score_adj
-done
-
-

cluster/saltbase/salt/top.sls

@@ -33,11 +33,7 @@ base:
     - kube-registry-proxy
 {% endif %}
     - logrotate
-{% if grains['cloud'] is defined and grains.cloud == 'gce' %}
     - supervisor
-{% else %}
-    - monit
-{% endif %}
 
   'roles:kubernetes-master':
     - match: grain
@@ -46,11 +42,7 @@ base:
     - kube-apiserver
     - kube-controller-manager
     - kube-scheduler
-{% if grains['cloud'] is defined and grains.cloud == 'gce' %}
     - supervisor
-{% else %}
-    - monit
-{% endif %}
 {% if grains['cloud'] is defined and not grains.cloud in [ 'aws', 'gce', 'vagrant' ] %}
     - nginx
 {% endif %}