External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-19 23:07:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1136 from adidenko/fix-calico-policy-order

Browse Source 
Move calico-policy-controller into separate role
This commit is contained in:
Matthew Mosesohn
2017-03-17 17:32:14 +03:00
committed by GitHub
parent 7e1fbfba64 3a39904011
commit 25bff851dd
11 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View File

@@ -64,7 +64,7 @@ spec:
- --runtime-config={{ conf }}
{% endfor %}
{% endif %}
{% if enable_network_policy is defined and enable_network_policy == True %}
{% if enable_network_policy %}
- --runtime-config=extensions/v1beta1/networkpolicies=true
{% endif %}
- --v={{ kube_log_level }}