Merge pull request #24391 from bprashanth/ing_templated_controller

Automatic merge from submit-queue

Template the ingress controller 

We still need https://github.com/kubernetes/contrib/pull/791 to run the controller as a static pod
ref https://github.com/kubernetes/kubernetes/issues/23663
This commit is contained in:
k8s-merge-robot
2016-05-06 20:04:51 -07:00
5 changed files with 57 additions and 79 deletions

View File

@@ -35,6 +35,7 @@ addon-dir-create:
file.recurse:
- source: salt://kube-addons/cluster-loadbalancing/glbc
- include_pat: E@(^.+\.yaml$|^.+\.json$)
- template: jinja
- user: root
- group: root
- dir_mode: 755