Merge pull request #23316 from mikedanese/cadvisor-salt

Auto commit by PR queue bot
2016-03-25 06:17:16 -07:00 · 2016-03-25 06:17:16 -07:00 · 3c58510826
parent 548cfa68ca be5b669b45
commit 3c58510826
2 changed files with 0 additions and 5 deletions
--- a/cluster/saltbase/salt/cadvisor/init.sls
+++ b/cluster/saltbase/salt/cadvisor/init.sls
@ -1,3 +0,0 @@
-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