epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-10 20:29:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow to specify feature_control in calico cni config (#4879)

Browse Source 
* Allow to specify feature_control in calico cni config

* list length checking

* double check

* remove 2 conditions
This commit is contained in:
Tony Fouchard
2019-06-17 08:14:07 +02:00
committed by Kubernetes Prow Robot
parent 5c704552d8
commit f67a24499b
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
roles/network_plugin/calico/templates/cni-calico.conflist.j2
View File

@@ -28,6 +28,15 @@
"subnet": "usePodCidr"
},
{% endif %}
{% if (calico_feature_control is defined) and (calico_feature_control|length > 0) %}
"feature_control": {
{% for fc in calico_feature_control -%}
{% set fcval = calico_feature_control[fc] -%}
"{{ fc }}": {{ (fcval | string | lower) if (fcval == true or fcval == false) else "\"" + fcval + "\"" }}{{ "," if not loop.last else "" }}
{% endfor -%}
{{- "" }}
},
{% endif %}
{% if enable_network_policy %}
"policy": {
"type": "k8s"