Remove cAdvisor manifest from cluster startup.

cAdvisor is now integrated into the Kubelet and runs inside of it.

cluster/libvirt-coreos/util.sh

@@ -126,9 +126,6 @@ function initialize-pool {
   kube-push
 
   mkdir -p "$POOL_PATH/kubernetes/manifests"
-  if [[ "$ENABLE_NODE_MONITORING" == "true" ]]; then
-      cp "$KUBE_ROOT/cluster/saltbase/salt/cadvisor/cadvisor.manifest" "$POOL_PATH/kubernetes/manifests"
-  fi
   if [[ "$ENABLE_NODE_LOGGING" == "true" ]]; then
       if [[ "$LOGGING_DESTINATION" == "elasticsearch" ]]; then
           cp "$KUBE_ROOT/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest" "$POOL_PATH/kubernetes/manifests"

cluster/rackspace/cloud-config/minion-cloud-config.yaml

@@ -22,41 +22,6 @@ write_files:
       echo "Unpacking release"
       rm -rf /opt/kubernetes || false
       tar xzf /opt/kubernetes.tar.gz -C /opt/
-  - path: /opt/kubernetes-manifests/cadvisor.manifest
-    permissions: 0755
-    content: |
-      version: v1beta2
-      id: cadvisor-agent
-      containers:
-        - name: cadvisor
-          image: google/cadvisor:latest
-          ports:
-            - name: http
-              containerPort: 8080
-              hostPort: 4194
-          volumeMounts:
-            - name: varrun
-              mountPath: /var/run
-              readOnly: false
-            - name: varlibdocker
-              mountPath: /var/lib/docker
-              readOnly: true
-            - name: cgroups
-              mountPath: /sys/fs/cgroup
-              readOnly: true
-      volumes:
-        - name: varrun
-          source:
-            hostDir:
-              path: /var/run
-        - name: varlibdocker
-          source:
-            hostDir:
-              path: /var/lib/docker
-        - name: cgroups
-          source:
-            hostDir:
-              path: /sys/fs/cgroup
 
 coreos:
   etcd:

cluster/saltbase/salt/cadvisor/cadvisor.manifest

@@ -1,32 +0,0 @@
-version: v1beta2
-id: cadvisor-agent
-containers:
-  - name: cadvisor
-    image: google/cadvisor:0.8.0
-    ports:
-      - name: http
-        containerPort: 8080
-        hostPort: 4194
-    volumeMounts:
-      - name: varrun
-        mountPath: /var/run
-        readOnly: false
-      - name: varlibdocker
-        mountPath: /var/lib/docker
-        readOnly: true
-      - name: sysfs
-        mountPath: /sys
-        readOnly: true
-volumes:
-  - name: varrun
-    source:
-      hostDir:
-        path: /var/run
-  - name: varlibdocker
-    source:
-      hostDir:
-        path: /var/lib/docker
-  - name: sysfs
-    source:
-      hostDir:
-        path: /sys

cluster/saltbase/salt/cadvisor/init.sls

@@ -1,8 +1,3 @@
-/etc/kubernetes/manifests/cadvisor.manifest:
+delete_cadvisor_manifest:
-  file.managed:
+  file.absent:
-    - source: salt://cadvisor/cadvisor.manifest
+    - name: /etc/kubernetes/manifests/cadvisor.manifest
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755

cluster/saltbase/salt/kubelet/init.sls

@@ -72,6 +72,3 @@ kubelet:
       - file: /etc/init.d/kubelet
 {% endif %}
       - file: /var/lib/kubelet/kubernetes_auth
-{% if pillar.get('enable_node_monitoring', '').lower() == 'true' %}
-      - file: /etc/kubernetes/manifests/cadvisor.manifest
-{% endif %}

cluster/saltbase/salt/top.sls

@@ -11,11 +11,9 @@ base:
 {% else %}
     - sdn
 {% endif %}
+    - cadvisor
     - kubelet
     - kube-proxy
-{% if pillar.get('enable_node_monitoring', '').lower() == 'true' %}
-    - cadvisor
-{% endif %}
 {% if pillar.get('enable_node_logging', '').lower() == 'true' %}
   {% if pillar['logging_destination'] is defined and pillar['logging_destination'] == 'elasticsearch' %}
     - fluentd-es