Browse Source
Merge pull request #2472 from woopstar/patch-12
Make sure output from extra args is strings
pull/2477/head
Andreas Krüger
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
roles/kubernetes/master/templates/kubeadm-config.yaml.j2
|
|
|
@ -62,7 +62,7 @@ apiServerExtraArgs: |
|
|
|
{% endif %} |
|
|
|
allow-privileged: "true" |
|
|
|
{% for key in kube_kubeadm_apiserver_extra_args %} |
|
|
|
{{ key }}: {{ kube_kubeadm_apiserver_extra_args[key] }} |
|
|
|
{{ key }}: "{{ kube_kubeadm_apiserver_extra_args[key] }}" |
|
|
|
{% endfor %} |
|
|
|
controllerManagerExtraArgs: |
|
|
|
node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }} |
|
|
|
@ -72,12 +72,12 @@ controllerManagerExtraArgs: |
|
|
|
feature-gates: {{ kube_feature_gates|join(',') }} |
|
|
|
{% endif %} |
|
|
|
{% for key in kube_kubeadm_controller_extra_args %} |
|
|
|
{{ key }}: {{ kube_kubeadm_controller_extra_args[key] }} |
|
|
|
{{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}" |
|
|
|
{% endfor %} |
|
|
|
{% if kube_kubeadm_scheduler_extra_args|length > 0 %} |
|
|
|
schedulerExtraArgs: |
|
|
|
{% for key in kube_kubeadm_scheduler_extra_args %} |
|
|
|
{{ key }}: {{ kube_kubeadm_scheduler_extra_args[key] }} |
|
|
|
{{ key }}: "{{ kube_kubeadm_scheduler_extra_args[key] }}" |
|
|
|
{% endfor %} |
|
|
|
{% endif %} |
|
|
|
apiServerCertSANs: |
|
|
|
|
