Merge pull request #23316 from mikedanese/cadvisor-salt

Auto commit by PR queue bot

Merge pull request #23316 from mikedanese/cadvisor-salt
3c585108 · k8s-merge-robot · 548cfa68 · be5b669b · 548cfa68 · 3c585108
Commit 3c585108 authored Mar 25, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

init.sls cluster/saltbase/salt/cadvisor/init.sls +0 -3

top.sls cluster/saltbase/salt/top.sls +0 -2

No files found.
--- a/cluster/saltbase/salt/cadvisor/init.sls
+++ b/cluster/saltbase/salt/cadvisor/init.sls
-delete_cadvisor_manifest:
-  file.absent:
-    - name: /etc/kubernetes/manifests/cadvisor.manifest
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -19,7 +19,6 @@ base:
    - cni
 {% endif %}
    - helpers
-    - cadvisor
    - kube-client-tools
    - kube-node-unpacker
    - kubelet
@@ -55,7 +54,6 @@ base:
    - kube-controller-manager
    - kube-scheduler
    - supervisor
-    - cadvisor
    - kube-client-tools
    - kube-master-addons
    - kube-admission-controls