From 842907613b7348c80d627c75b5718db6ea129fce Mon Sep 17 00:00:00 2001
From: Victor Marmol <vmarmol@google.com>
Date: Tue, 1 Jul 2014 10:48:29 -0700
Subject: [PATCH] Run cAdvisor on all minions.

---
 .../saltbase/salt/cadvisor/cadvisor.manifest  | 26 +++++++++++++++++++
 cluster/saltbase/salt/cadvisor/init.sls       |  8 ++++++
 cluster/saltbase/salt/kubelet/default         |  2 +-
 cluster/saltbase/salt/top.sls                 |  1 +
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 cluster/saltbase/salt/cadvisor/cadvisor.manifest
 create mode 100755 cluster/saltbase/salt/cadvisor/init.sls

diff --git a/cluster/saltbase/salt/cadvisor/cadvisor.manifest b/cluster/saltbase/salt/cadvisor/cadvisor.manifest
new file mode 100644
index 00000000000..b3a70a308f2
--- /dev/null
+++ b/cluster/saltbase/salt/cadvisor/cadvisor.manifest
@@ -0,0 +1,26 @@
+version: v1beta2
+id: cadvisor-agent
+containers:
+  - name: cadvisor
+    image: google/cadvisor
+    ports:
+      - name: http
+        containerPort: 8080
+        hostPort: 5000
+    volumeMounts:
+      - name: var-run
+        mountPath: /var/run
+        readOnly: false
+        mountType: HOST
+      - name: var-lib-docker
+        mountPath: /var/lib/docker
+        readOnly: true
+        mountType: HOST
+      - name: cgroups
+        mountPath: /sys/fs/cgroup
+        readOnly: true
+        mountType: HOST
+volumes:
+  -name: var-run
+  -name: var-lib-docker
+  -name: var-cgroups
diff --git a/cluster/saltbase/salt/cadvisor/init.sls b/cluster/saltbase/salt/cadvisor/init.sls
new file mode 100755
index 00000000000..d361243730d
--- /dev/null
+++ b/cluster/saltbase/salt/cadvisor/init.sls
@@ -0,0 +1,8 @@
+/etc/kubernetes/manifests/cadvisor.manifest:
+  file.managed:
+    - source: salt://cadvisor/cadvisor.manifest
+    - user: root
+    - group: root
+    - mode: 644
+    - makedirs: true
+    - dir_mode: 755
diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index 34008a7f766..c6f547cf4ea 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -1,2 +1,2 @@
 {%- set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() %}
-DAEMON_ARGS="$DAEMON_ARGS -etcd_servers=http://{{ ips[0][0] }}:4001 -address=$HOSTNAME"
+DAEMON_ARGS="$DAEMON_ARGS -etcd_servers=http://{{ ips[0][0] }}:4001 -address=$HOSTNAME -config=/etc/kubernetes/manifests"
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index 17e9264cf74..432e52d44df 100755
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -8,6 +8,7 @@ base:
     - docker
     - kubelet
     - kube-proxy
+    - cadvisor
 
   'roles:kubernetes-master':
     - match: grain