C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/network_plugin/calico/defaults/main.yml
View file

@ -72,3 +72,5 @@ calico_datastore: "etcd"
typha_enabled: false typha_enabled: false
# Number of typha replicas # Number of typha replicas
typha_replicas: 1 typha_replicas: 1
calico_feature_control: {}

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

@ -28,6 +28,15 @@
"subnet": "usePodCidr" "subnet": "usePodCidr"
}, },
{% endif %} {% 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 %} {% if enable_network_policy %}
"policy": { "policy": {
"type": "k8s" "type": "k8s"