github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-04 18:52:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23316 from mikedanese/cadvisor-salt

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-25 06:17:16 -07:00
parent 548cfa68ca be5b669b45
commit 3c58510826
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/saltbase/salt/cadvisor/init.sls
View File

@@ -1,3 +0,0 @@
delete_cadvisor_manifest:
file.absent:
- name: /etc/kubernetes/manifests/cadvisor.manifest

2
cluster/saltbase/salt/top.sls
View File

@@ -19,7 +19,6 @@ base:
- cni - cni
{% endif %} {% endif %}
- helpers - helpers
- cadvisor
- kube-client-tools - kube-client-tools
- kube-node-unpacker - kube-node-unpacker
- kubelet - kubelet
@@ -55,7 +54,6 @@ base:
- kube-controller-manager - kube-controller-manager
- kube-scheduler - kube-scheduler
- supervisor - supervisor
- cadvisor
- kube-client-tools - kube-client-tools
- kube-master-addons - kube-master-addons
- kube-admission-controls - kube-admission-controls