External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-06-08 16:36:15 -02:30
Code Issues Packages Projects Releases Wiki Activity

roles: rely on configured defaults (#13249)

Browse Source 
Signed-off-by: Zakhar Dvurechensky <72825626+Zakharden@users.noreply.github.com>
This commit is contained in:
Zakhar Dvurechensky
2026-05-27 12:39:50 +03:00
committed by GitHub
parent 03ae25e410
commit 9049703ce0
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/preinstall/templates/dhclient_dnsupdate.sh.j2
View File

@@ -6,7 +6,7 @@
if [ $reason = "BOUND" ]; then
if [ -n "$new_domain_search" -o -n "$new_domain_name_servers" ]; then
RESOLV_CONF=$(cat /etc/resolv.conf | sed -r '/^options (timeout|attempts|ndots).*$/d')
OPTIONS="options timeout:{{ dns_timeout|default('2') }} attempts:{{ dns_attempts|default('2') }} ndots:{{ ndots }}"
OPTIONS="options timeout:{{ dns_timeout }} attempts:{{ dns_attempts }} ndots:{{ ndots }}"
printf "%b\n" "$RESOLV_CONF\n$OPTIONS" > /etc/resolv.conf
fi

2
roles/kubernetes/preinstall/templates/dhclient_dnsupdate_rh.sh.j2
View File

@@ -6,7 +6,7 @@
zdnsupdate_config() {
if [ -n "$new_domain_search" -o -n "$new_domain_name_servers" ]; then
RESOLV_CONF=$(cat /etc/resolv.conf | sed -r '/^options (timeout|attempts|ndots).*$/d')
OPTIONS="options timeout:{{ dns_timeout|default('2') }} attempts:{{ dns_attempts|default('2') }} ndots:{{ ndots }}"
OPTIONS="options timeout:{{ dns_timeout }} attempts:{{ dns_attempts }} ndots:{{ ndots }}"
echo -e "$RESOLV_CONF\n$OPTIONS" > /etc/resolv.conf
fi