Merge pull request #7246 from satnam6502/es

Convert Elasticsearch logging to v1beta3 and de-salt
2015-04-24 09:21:41 -07:00
parent dca49ba5e1 c9b9e7651e
commit 84cb48be11
4 changed files with 45 additions and 49 deletions
--- a/cluster/saltbase/salt/kube-addons/init.sls
+++ b/cluster/saltbase/salt/kube-addons/init.sls
@@ -38,14 +38,6 @@
    - group: root
    - dir_mode: 755
    - file_mode: 644
-
-/etc/kubernetes/addons/fluentd-elasticsearch/es-controller.yaml:
-  file.managed:
-    - source: salt://kube-addons/fluentd-elasticsearch/es-controller.yaml.in
-    - template: jinja
-    - group: root
-    - dir_mode: 755
-    - makedirs: True
 {% endif %}

 /etc/kubernetes/kube-addons.sh: