fix: config hostname as string type in kubeadmConf rendering (#10997)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>pull/11028/head
parent
a1cf8291a9
commit
30da721f82
|
@ -14,7 +14,7 @@ certificateKey: {{ kubeadm_certificate_key }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
nodeRegistration:
|
nodeRegistration:
|
||||||
{% if kube_override_hostname | default('') %}
|
{% if kube_override_hostname | default('') %}
|
||||||
name: {{ kube_override_hostname }}
|
name: "{{ kube_override_hostname }}"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %}
|
{% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %}
|
||||||
taints:
|
taints:
|
||||||
|
@ -76,17 +76,17 @@ etcd:
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
serverCertSANs:
|
serverCertSANs:
|
||||||
{% for san in etcd_cert_alt_names %}
|
{% for san in etcd_cert_alt_names %}
|
||||||
- {{ san }}
|
- "{{ san }}"
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% for san in etcd_cert_alt_ips %}
|
{% for san in etcd_cert_alt_ips %}
|
||||||
- {{ san }}
|
- "{{ san }}"
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
peerCertSANs:
|
peerCertSANs:
|
||||||
{% for san in etcd_cert_alt_names %}
|
{% for san in etcd_cert_alt_names %}
|
||||||
- {{ san }}
|
- "{{ san }}"
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% for san in etcd_cert_alt_ips %}
|
{% for san in etcd_cert_alt_ips %}
|
||||||
- {{ san }}
|
- "{{ san }}"
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
dns:
|
dns:
|
||||||
|
@ -294,7 +294,7 @@ apiServer:
|
||||||
{% endif %}
|
{% endif %}
|
||||||
certSANs:
|
certSANs:
|
||||||
{% for san in apiserver_sans %}
|
{% for san in apiserver_sans %}
|
||||||
- {{ san }}
|
- "{{ san }}"
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
timeoutForControlPlane: 5m0s
|
timeoutForControlPlane: 5m0s
|
||||||
controllerManager:
|
controllerManager:
|
||||||
|
@ -416,7 +416,7 @@ conntrack:
|
||||||
tcpEstablishedTimeout: {{ kube_proxy_conntrack_tcp_established_timeout }}
|
tcpEstablishedTimeout: {{ kube_proxy_conntrack_tcp_established_timeout }}
|
||||||
enableProfiling: {{ kube_proxy_enable_profiling }}
|
enableProfiling: {{ kube_proxy_enable_profiling }}
|
||||||
healthzBindAddress: {{ kube_proxy_healthz_bind_address }}
|
healthzBindAddress: {{ kube_proxy_healthz_bind_address }}
|
||||||
hostnameOverride: {{ kube_override_hostname }}
|
hostnameOverride: "{{ kube_override_hostname }}"
|
||||||
iptables:
|
iptables:
|
||||||
masqueradeAll: {{ kube_proxy_masquerade_all }}
|
masqueradeAll: {{ kube_proxy_masquerade_all }}
|
||||||
masqueradeBit: {{ kube_proxy_masquerade_bit }}
|
masqueradeBit: {{ kube_proxy_masquerade_bit }}
|
||||||
|
|
Loading…
Reference in New Issue