Merge pull request #2977 from openshift-cherrypick-robot/cherry-pick-…

…2970-to-release-4.7 [release-4.7] Bug 2059724: Prepend to search domains instead of replacing
openshift · Mar 10, 2022 · 19b5394 · 19b5394
2 parents 824271e + 4fcfa74
commit 19b5394
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml b/templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml
@@ -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