From be5b669b455f310d1edd7c7a409cd5f1e2d23c6d Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Mon, 21 Mar 2016 18:17:07 -0700 Subject: [PATCH] remove cadvisor salt We have been removing cadviosr.manifest for over a year to cleanup the old deployment style. I think we are ok at this point. --- cluster/saltbase/salt/cadvisor/init.sls | 3 --- cluster/saltbase/salt/top.sls | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 cluster/saltbase/salt/cadvisor/init.sls diff --git a/cluster/saltbase/salt/cadvisor/init.sls b/cluster/saltbase/salt/cadvisor/init.sls deleted file mode 100644 index 5ee3b32077..0000000000 --- a/cluster/saltbase/salt/cadvisor/init.sls +++ /dev/null @@ -1,3 +0,0 @@ -delete_cadvisor_manifest: - file.absent: - - name: /etc/kubernetes/manifests/cadvisor.manifest diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls index b0c1fd01f4..f1fd943c74 100644 --- 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