Browse Source

Make sure output from extra args is strings

Setting the following:

```
kube_kubeadm_controller_extra_args:
  address: 0.0.0.0
  terminated-pod-gc-threshold: "100"
```

Results in `terminated-pod-gc-threshold: 100` in the kubeadm config file. But it has to be a string to work.
pull/2472/head
Andreas Krüger 7 years ago
committed by GitHub
parent
commit
788e41a315
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
  1. 6
      roles/kubernetes/master/templates/kubeadm-config.yaml.j2

6
roles/kubernetes/master/templates/kubeadm-config.yaml.j2

@ -59,7 +59,7 @@ apiServerExtraArgs:
{% endif %} {% endif %}
allow-privileged: "true" allow-privileged: "true"
{% for key in kube_kubeadm_apiserver_extra_args %} {% for key in kube_kubeadm_apiserver_extra_args %}
{{ key }}: {{ kube_kubeadm_apiserver_extra_args[key] }} {{ key }}: {{ kube_kubeadm_apiserver_extra_args[key]|string }}
{% endfor %} {% endfor %}
controllerManagerExtraArgs: controllerManagerExtraArgs:
node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }} node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }}
@ -69,12 +69,12 @@ controllerManagerExtraArgs:
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}
{% for key in kube_kubeadm_controller_extra_args %} {% for key in kube_kubeadm_controller_extra_args %}
{{ key }}: {{ kube_kubeadm_controller_extra_args[key] }} {{ key }}: {{ kube_kubeadm_controller_extra_args[key]|string }}
{% endfor %} {% endfor %}
{% if kube_kubeadm_scheduler_extra_args|length > 0 %} {% if kube_kubeadm_scheduler_extra_args|length > 0 %}
schedulerExtraArgs: schedulerExtraArgs:
{% for key in kube_kubeadm_scheduler_extra_args %} {% for key in kube_kubeadm_scheduler_extra_args %}
{{ key }}: {{ kube_kubeadm_scheduler_extra_args[key] }} {{ key }}: {{ kube_kubeadm_scheduler_extra_args[key]|string }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
apiServerCertSANs: apiServerCertSANs:

|||||||
100:0
Loading…
Cancel
Save