Commit 3c585108 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #23316 from mikedanese/cadvisor-salt

Auto commit by PR queue bot
parents 548cfa68 be5b669b
delete_cadvisor_manifest:
file.absent:
- name: /etc/kubernetes/manifests/cadvisor.manifest
...@@ -19,7 +19,6 @@ base: ...@@ -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: ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment