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

Jump to bottom

[release-4.7] Bug 2059724: Prepend to search domains instead of replacing #2977

Merged
merged 3 commits into from
Mar 10, 2022
Merged

[release-4.7] Bug 2059724: Prepend to search domains instead of replacing #2977

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc41672
Prepend to search domains instead of replacing
cybertron Nov 4, 2021
99ec275
Bug 2024826: Allow resolv prepender without default search domain
mandre Nov 19, 2021
4fcfa74
Fix duplicate prepender entries in resolv.conf
cybertron Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,13 @@ contents:
fi
else
>&2 echo "NM resolv-prepender: Prepending 'nameserver $NAMESERVER_IP' to /etc/resolv.conf (other nameservers from /var/run/NetworkManager/resolv.conf)"
sed -e "/^search/d" \
-e "/Generated by/c# Generated by KNI resolv prepender NM dispatcher script\nsearch $DOMAINS\nnameserver $NAMESERVER_IP" \
sed -e "/Generated by/c# Generated by KNI resolv prepender NM dispatcher script" \
/var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
sed -i "0,/^nameserver.*/s//nameserver $NAMESERVER_IP\n\0/" /etc/resolv.tmp
# Make sure cluster domain is first in the search list
sed -i "s/^search \(.*\)/search {{.DNS.Spec.BaseDomain}} \1/" /etc/resolv.tmp
# Remove duplicate cluster domain entries
sed -i "s/\(search {{.DNS.Spec.BaseDomain}}.*\) {{.DNS.Spec.BaseDomain}}\( .*\|$\)/\1\2/" /etc/resolv.tmp
# Only leave the first 3 nameservers in /etc/resolv.conf
sed -i ':a $!{N; ba}; s/\(^\|\n\)nameserver/\n# nameserver/4g' /etc/resolv.tmp
mv -f /etc/resolv.tmp /etc/resolv.conf
Expand Down