Skip to content

Bug 1841260: Make resolv.conf prepend operation atomic #1763

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

Merged
openshift-merge-robot merged 3 commits into from
May 29, 2020
Merged

Bug 1841260: Make resolv.conf prepend operation atomic #1763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa4ede7
Make resolv.conf prepend operation atomic
cybertron May 28, 2020
e42c838
Move baremetal NetworkManager dispatcher script to common
cybertron May 28, 2020
5be02dc
set -eo pipefail in dispatcher script
cybertron May 28, 2020
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
9 changes: 5 additions & 4 deletions ...iles/NetworkManager-resolv-prepender.yaml → ...iles/NetworkManager-resolv-prepender.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ path: "/etc/NetworkManager/dispatcher.d/30-resolv-prepender"
contents:
inline: |
#!/bin/bash
set -eo pipefail
IFACE=$1
STATUS=$2
# If $DHCP6_FQDN_FQDN is not empty and is not localhost.localdomain
Expand All @@ -20,18 +21,18 @@ contents:
"{{.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP}}" \
"{{.Infra.Status.PlatformStatus.BareMetal.IngressIP}}")
DOMAIN="{{.EtcdDiscoveryDomain}}"
set +e
if [[ -n "$NAMESERVER_IP" ]]; then
logger -s "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 $DOMAIN\nnameserver $NAMESERVER_IP" \
/var/run/NetworkManager/resolv.conf > /etc/resolv.conf
/var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
else
logger -s "NM resolv-prepender: Couldn't find a Virtual IP, just updating resolv.conf"
cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf
cp /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
fi
# Only leave the first 3 nameservers in /etc/resolv.conf
sed -i ':a $!{N; ba}; s/\(^\|\n\)nameserver/\n# nameserver/4g' /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
9 changes: 5 additions & 4 deletions templates/master/00-master/openstack/files/NetworkManager-resolv-prepender.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,26 @@ path: "/etc/NetworkManager/dispatcher.d/30-resolv-prepender"
contents:
inline: |
#!/bin/bash
set -eo pipefail
IFACE=$1
STATUS=$2
case "$STATUS" in
up|down|dhcp4-change|dhcp6-change)
logger -s "NM resolv-prepender triggered by ${1} ${2}."
NAMESERVER_IP="{{.Infra.Status.PlatformStatus.OpenStack.NodeDNSIP}}"
DOMAIN="{{.EtcdDiscoveryDomain}}"
set +e
if [[ -n "$NAMESERVER_IP" ]]; then
logger -s "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 OpenStack resolv prepender NM dispatcher script\nsearch $DOMAIN\nnameserver $NAMESERVER_IP" \
/var/run/NetworkManager/resolv.conf > /etc/resolv.conf
/var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
else
logger -s "NM resolv-prepender: Couldn't find a Virtual IP, just updating resolv.conf"
cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf
cp /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
fi
# Only leave the first 3 nameservers in /etc/resolv.conf
sed -i ':a $!{N; ba}; s/\(^\|\n\)nameserver/\n# nameserver/4g' /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
7 changes: 4 additions & 3 deletions templates/master/00-master/vsphere/files/NetworkManager-resolv-prepender.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents:
{{ if .Infra.Status.PlatformStatus.VSphere -}}
{{ if .Infra.Status.PlatformStatus.VSphere.APIServerInternalIP -}}
#!/bin/bash
set -eo pipefail
IFACE=$1
STATUS=$2
# If $DHCP6_FQDN_FQDN is not empty and is not localhost.localdomain
Expand All @@ -19,16 +20,16 @@ contents:
"{{.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP}}" \
"{{.Infra.Status.PlatformStatus.VSphere.IngressIP}}")
DOMAIN="{{.EtcdDiscoveryDomain}}"
set +e
if [[ -n "$NAMESERVER_IP" ]]; then
logger -s "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 $DOMAIN\nnameserver $NAMESERVER_IP" \
/var/run/NetworkManager/resolv.conf > /etc/resolv.conf
/var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
else
logger -s "NM resolv-prepender: Couldn't find a Virtual IP, just updating resolv.conf"
cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf
cp /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
fi
mv -f /etc/resolv.tmp /etc/resolv.conf
;;
*)
;;
Expand Down
38 changes: 0 additions & 38 deletions templates/worker/00-worker/baremetal/files/NetworkManager-resolv-prepender.yaml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions templates/worker/00-worker/openstack/files/NetworkManager-resolv-prepender.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ contents:
"{{.Infra.Status.PlatformStatus.OpenStack.NodeDNSIP}}" \
"{{.Infra.Status.PlatformStatus.OpenStack.IngressIP}}")
DOMAIN="{{.EtcdDiscoveryDomain}}"
set +e
if [[ -n "$NAMESERVER_IP" ]]; then
logger -s "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 OpenStack resolv prepender NM dispatcher script\nsearch $DOMAIN\nnameserver $NAMESERVER_IP" \
/var/run/NetworkManager/resolv.conf > /etc/resolv.conf
/var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
else
logger -s "Couldn't find a non-virtual IP, just updating resolv.conf"
cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf
cp /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
fi
# Only leave the first 3 nameservers in /etc/resolv.conf
sed -i ':a $!{N; ba}; s/\(^\|\n\)nameserver/\n# nameserver/4g' /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
6 changes: 3 additions & 3 deletions templates/worker/00-worker/vsphere/files/NetworkManager-resolv-prepender.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ contents:
"{{.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP}}" \
"{{.Infra.Status.PlatformStatus.VSphere.IngressIP}}")
DOMAIN="{{.EtcdDiscoveryDomain}}"
set +e
if [[ -n "$NAMESERVER_IP" ]]; then
logger -s "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 $DOMAIN\nnameserver $NAMESERVER_IP" \
/var/run/NetworkManager/resolv.conf > /etc/resolv.conf
/var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
else
logger -s "Couldn't find a non-virtual IP, just updating resolv.conf"
cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf
cp /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
fi
mv -f /etc/resolv.tmp /etc/resolv.conf
;;
*)
;;
Expand Down