From ff3f463e00e046956fba334e44840f68a7922115 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Sun, 7 Jun 2015 21:51:01 -0700
Subject: [PATCH] Add liveness checks to the controller-manager and scheduler.

---
 .../kube-controller-manager.manifest                      | 8 ++++++++
 .../saltbase/salt/kube-scheduler/kube-scheduler.manifest  | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
index a446187bb99..7b6c6a2d416 100644
--- a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
+++ b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
@@ -41,6 +41,14 @@
                  "-c",
                  "/usr/local/bin/kube-controller-manager {{params}} 1>>/var/log/kube-controller-manager.log 2>&1"
                ],
+    "livenessProbe": {
+      "httpGet": {
+        "path": "/healthz",
+        "port": 10252
+      },
+      "initialDelaySeconds": 15,
+      "timeoutSeconds": 15
+    },
     "volumeMounts": [
         { "name": "srvkube",
         "mountPath": "/srv/kubernetes",
diff --git a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
index cb53aa02331..04f349d650e 100644
--- a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
+++ b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
@@ -13,6 +13,14 @@
                  "-c",
                  "/usr/local/bin/kube-scheduler --master=127.0.0.1:8080 {{pillar['log_level']}} 1>>/var/log/kube-scheduler.log 2>&1"
                ],
+    "livenessProbe": {
+      "httpGet": {
+        "path": "/healthz",
+        "port": 10251
+      },
+      "initialDelaySeconds": 15,
+      "timeoutSeconds": 15
+    },
     "volumeMounts": [
         {
           "name": "logfile",