Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: config hostname as string type in kubeadmConfig rendering #10997

Merged
merged 1 commit into from
Mar 22, 2024
Merged

fix: config hostname as string type in kubeadmConfig rendering #10997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ certificateKey: {{ kubeadm_certificate_key }}
{% endif %}
nodeRegistration:
{% if kube_override_hostname | default('') %}
name: {{ kube_override_hostname }}
name: "{{ kube_override_hostname }}"
{% endif %}
{% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %}
taints:
Expand Down Expand Up @@ -76,17 +76,17 @@ etcd:
{% endfor %}
serverCertSANs:
{% for san in etcd_cert_alt_names %}
- {{ san }}
- "{{ san }}"
{% endfor %}
{% for san in etcd_cert_alt_ips %}
- {{ san }}
- "{{ san }}"
{% endfor %}
peerCertSANs:
{% for san in etcd_cert_alt_names %}
- {{ san }}
- "{{ san }}"
{% endfor %}
{% for san in etcd_cert_alt_ips %}
- {{ san }}
- "{{ san }}"
{% endfor %}
{% endif %}
dns:
Expand Down Expand Up @@ -294,7 +294,7 @@ apiServer:
{% endif %}
certSANs:
{% for san in apiserver_sans %}
- {{ san }}
- "{{ san }}"
{% endfor %}
timeoutForControlPlane: 5m0s
controllerManager:
Expand Down Expand Up @@ -416,7 +416,7 @@ conntrack:
tcpEstablishedTimeout: {{ kube_proxy_conntrack_tcp_established_timeout }}
enableProfiling: {{ kube_proxy_enable_profiling }}
healthzBindAddress: {{ kube_proxy_healthz_bind_address }}
hostnameOverride: {{ kube_override_hostname }}
hostnameOverride: "{{ kube_override_hostname }}"
iptables:
masqueradeAll: {{ kube_proxy_masquerade_all }}
masqueradeBit: {{ kube_proxy_masquerade_bit }}
Expand Down