Bug 1919271: [on-prem] NM resolve prepender: support appending a nameserver for systemd-resolved #2359

vrutkovs · 2021-01-22T16:01:03Z

FCOS 33 doesn't use NM to manage resolv.conf. Instead it uses systemd-resolved.

The script should not replace /etc/resolv.conf in this case, but instead create a dropin for systemd-resolved

4.6 cherry-pick: #2356

openshift-ci-robot · 2021-01-22T16:01:10Z

@vrutkovs: This pull request references Bugzilla bug 1919271, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1919271: NM resolve prepender: support appending a nameserver for systemd-resolved

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

vrutkovs · 2021-01-22T16:01:25Z

/test okd-e2e-vsphere

vrutkovs · 2021-01-25T15:30:41Z

/retest

vrutkovs · 2021-01-27T08:11:13Z

/retest

vrutkovs · 2021-01-27T09:32:47Z

/test okd-e2e-vsphere

yuqi-zhang

Code looks fine, I'm not sure if the Only leave the first 3 nameservers in /etc/resolv.conf moving into the $NAMESERVER_IP condition affects anything. It'd be good for the metal team to have the final lgtm

darkmuggle · 2021-01-27T16:22:41Z

templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml

-                /var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
+            source /etc/os-release
+            if [[ "$NAME" == "Fedora" ]]; then
+                echo "[Resolve]" > /etc/systemd/resolved.conf.d/kni.conf


https://www.freedesktop.org/software/systemd/man/resolved.conf.html

I think we should use something like 60-kni.conf to make ordering easier.

Good idea, updated

…lved FCOS 33 doesn't use NM to manage resolv.conf. Instead it uses systemd-resolved. The script should not replace /etc/resolv.conf in this case, but instead create a dropin for systemd-resolved

vrutkovs · 2021-01-27T17:04:43Z

I'm not sure if the Only leave the first 3 nameservers in /etc/resolv.conf moving into the $NAMESERVER_IP condition affects anything

Nameservers would be cleaned up on RHCOS when new interface is up and NAMESERVER_IP is resolved (previously we'd clean those regardless of NAMESERVER_IP result). I don't think this would regress in any corner case really

iamemilio · 2021-01-27T17:29:42Z

/test e2e-openstack

kikisdeliveryservice · 2021-01-27T17:38:03Z

holding for on-prem reviews

/hold

kikisdeliveryservice · 2021-01-27T17:39:30Z

/assign @bcrochet @EmilienM @jcpowermac @yboaron

mandre · 2021-01-27T19:13:28Z

templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml

-                -e "/Generated by/c# Generated by KNI resolv prepender NM dispatcher script\nsearch $DOMAIN\nnameserver $NAMESERVER_IP" \
-                /var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
+            source /etc/os-release
+            if [[ "$NAME" == "Fedora" ]]; then


What sets the $NAME variable? Don't you also need to check the version of Fedora?

Perhaps a better check would be to look for the use of systemd-resolved, so that there's no surprise when RHCOS switches to it.

What sets the $NAME variable?

Its being set after source /etc/os-release

Don't you also need to check the version of Fedora?

We could add this later, but OKD 4.6 uses F33+, so systemd-resolved would certainly be used

Perhaps a better check would be to look for the use of systemd-resolved

That was my initial approach, but its not clear if there is a nice way to do that - check that /etc/resolv.conf is a symlink? systemd-resolved service is running?

I think the most robust is systemctl is-active --quiet systemd-resolved

For some reason that didn't work. I'll have another look and follow up on that later

Yeah, don't worry too much about it. I think we'll know where to look if suddenly DNS stops working.

I think checking for the link should be fine.

iamemilio · 2021-01-28T15:32:00Z

/lgtm

I think this is good to go

celebdor · 2021-01-28T17:47:31Z

templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml

-                -e "/Generated by/c# Generated by KNI resolv prepender NM dispatcher script\nsearch $DOMAIN\nnameserver $NAMESERVER_IP" \
-                /var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
+            source /etc/os-release
+            if [[ "$NAME" == "Fedora" ]]; then


I think checking for the link should be fine.

celebdor · 2021-01-28T17:48:32Z

templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml

+            if [[ "$NAME" == "Fedora" ]]; then
+                echo "[Resolve]" > /etc/systemd/resolved.conf.d/60-kni.conf
+                echo "DNS=$NAMESERVER_IP" >> /etc/systemd/resolved.conf.d/60-kni.conf
+                echo "Domains=$DOMAIN" >> /etc/systemd/resolved.conf.d/60-kni.conf


Wouldn't it be nicer to have a single heredoc or an echo with "\n" instead of three separate echo?

The most cleanest way would be creating this file unconditionally - and it would be caught up in RHEL when it does the switch. WDYT?

I don't have a preference how to write the file, seems echo with '\n' would the cleanest option. I don't mind rewriting it if you insist

jcpowermac · 2021-01-29T14:16:03Z

/lgtm

cybertron · 2021-01-29T16:27:47Z

/lgtm

Seems like everyone is in agreement on the functionality of this. If we want to modify how things get done we can always do that in a followup.

openshift-ci-robot · 2021-01-29T16:28:09Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cybertron, Fedosin, iamemilio, jcpowermac, mandre, vrutkovs, yuqi-zhang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [yuqi-zhang]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

kikisdeliveryservice · 2021-01-29T16:35:36Z

/hold cancel

openshift-bot · 2021-01-29T16:49:36Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T17:15:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T18:46:38Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T19:12:36Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T20:30:38Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T22:02:04Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T23:19:40Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T04:44:41Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T06:41:41Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T06:54:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T09:30:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T09:43:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T09:56:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T10:09:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

vrutkovs · 2021-01-30T11:16:01Z

Skipping optional tests
/skip

openshift-bot · 2021-01-30T15:47:45Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2021-01-30T17:13:26Z

@vrutkovs: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/okd-e2e-vsphere	d49457253b0c3a3da863026841df6ff74b2bb235	link	`/test okd-e2e-vsphere`
ci/prow/okd-e2e-aws	`558b245`	link	`/test okd-e2e-aws`
ci/prow/e2e-aws-workers-rhel7	`558b245`	link	`/test e2e-aws-workers-rhel7`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-bot · 2021-01-30T17:18:44Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T17:57:42Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot · 2021-01-30T18:49:55Z

@vrutkovs: All pull requests linked via external trackers have merged:

openshift/machine-config-operator#2359

Bugzilla bug 1919271 has been moved to the MODIFIED state.

In response to this:

Bug 1919271: [on-prem] NM resolve prepender: support appending a nameserver for systemd-resolved

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jan 22, 2021

openshift-ci-robot requested review from cgwalters and sinnykumari January 22, 2021 16:01

fortinj66 mentioned this pull request Jan 25, 2021

Fresh Installation on FCOS33 fails due to https://github.com/coreos/fedora-coreos-tracker/issues/646 okd-project/okd#477

Closed

vrutkovs force-pushed the nameserver-prepend-systemd-resolved-support branch from 36d4f95 to d494572 Compare January 27, 2021 09:32

yuqi-zhang approved these changes Jan 27, 2021

View reviewed changes

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 27, 2021

darkmuggle reviewed Jan 27, 2021

View reviewed changes

NM resolve prepender: support appending a nameserver for systemd-reso…

558b245

…lved FCOS 33 doesn't use NM to manage resolv.conf. Instead it uses systemd-resolved. The script should not replace /etc/resolv.conf in this case, but instead create a dropin for systemd-resolved

vrutkovs force-pushed the nameserver-prepend-systemd-resolved-support branch from d494572 to 558b245 Compare January 27, 2021 16:58

kikisdeliveryservice changed the title ~~Bug 1919271: NM resolve prepender: support appending a nameserver for systemd-resolved~~ Bug 1919271: [on-prem] NM resolve prepender: support appending a nameserver for systemd-resolved Jan 27, 2021

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 27, 2021

openshift-ci-robot assigned bcrochet, EmilienM, jcpowermac and yboaron Jan 27, 2021

kikisdeliveryservice assigned iamemilio and unassigned yboaron Jan 27, 2021

mandre reviewed Jan 27, 2021

View reviewed changes

celebdor reviewed Jan 28, 2021

View reviewed changes

openshift-ci-robot assigned cybertron Jan 29, 2021

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 29, 2021

openshift-merge-robot merged commit 3ca5c67 into openshift:master Jan 30, 2021

This was referenced Feb 1, 2021

Bug 1919271: NM resolve prepender: Update for systemd-resolved logic. systemd-resolved requires restart after dropin created #2377

Merged

Bug 1919272: [release-4.6] NM resolve prepender: support appending a nameserver for systemd-resolved #2356

Merged

Bug 1919271: [on-prem] NM resolve prepender: support appending a nameserver for systemd-resolved #2359

Bug 1919271: [on-prem] NM resolve prepender: support appending a nameserver for systemd-resolved #2359

Conversation

vrutkovs commented Jan 22, 2021

openshift-ci-robot commented Jan 22, 2021

vrutkovs commented Jan 22, 2021

vrutkovs commented Jan 25, 2021

vrutkovs commented Jan 27, 2021

vrutkovs commented Jan 27, 2021

yuqi-zhang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vrutkovs commented Jan 27, 2021 • edited

iamemilio commented Jan 27, 2021

kikisdeliveryservice commented Jan 27, 2021

kikisdeliveryservice commented Jan 27, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iamemilio commented Jan 28, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jcpowermac commented Jan 29, 2021

cybertron commented Jan 29, 2021

openshift-ci-robot commented Jan 29, 2021

kikisdeliveryservice commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

vrutkovs commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-ci bot commented Jan 30, 2021 • edited

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-ci-robot commented Jan 30, 2021

vrutkovs commented Jan 27, 2021 •

edited

openshift-ci bot commented Jan 30, 2021 •

edited