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.

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

Bug 2017564: Prepend to search domains instead of replacing #2823

Merged

Conversation

cybertron
Copy link
Member

Previously the resolv-prepender script overwrote the search domains
with a specific set of domains, notably including the cluster domain
so cluster addresses will resolve. However, this is not desirable as
it may miss some configured search domains if they don't happen to
come in via DHCP (for example, search domains configured on an
interface via nmcli/nmstate).

This change modifies the prepender logic to also prepend the cluster
domain to the search domain list rather than overwrite it completely.
This means that we don't have to manage the full list of search
domains like we did before. We just add on to the default ones
NetworkManager writes, which should result in less confusing DNS
behavior from the script.

One caveat is that I don't know if the same method can be used for
the resolved case and I don't have any way to test that locally, so
I've left the logic there alone for now. If this turns out to be a
problem for OKD as well then someone will have to work with us to
get that behavior changed too.

- What I did

- How to verify it

- Description for the changelog
The resolv-prepender script no longer overwrites the search domain list. Instead, it prepends the cluster domain so cluster addresses will resolve as expected, but any custom DNS settings will also be respected.

Previously the resolv-prepender script overwrote the search domains
with a specific set of domains, notably including the cluster domain
so cluster addresses will resolve. However, this is not desirable as
it may miss some configured search domains if they don't happen to
come in via DHCP (for example, search domains configured on an
interface via nmcli/nmstate).

This change modifies the prepender logic to also prepend the cluster
domain to the search domain list rather than overwrite it completely.
This means that we don't have to manage the full list of search
domains like we did before. We just add on to the default ones
NetworkManager writes, which should result in less confusing DNS
behavior from the script.

One caveat is that I don't know if the same method can be used for
the resolved case and I don't have any way to test that locally, so
I've left the logic there alone for now. If this turns out to be a
problem for OKD as well then someone will have to work with us to
get that behavior changed too.
@cybertron
Copy link
Member Author

/hold

I need to test this locally to make sure I didn't miss any changes when I templated the new commands.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 4, 2021
@cybertron cybertron changed the title Prepend to search domains instead of replacing Bug 2017564: Prepend to search domains instead of replacing Nov 4, 2021
@openshift-ci openshift-ci bot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label Nov 4, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 4, 2021

@cybertron: This pull request references Bugzilla bug 2017564, 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.10.0) matches configured target release for branch (4.10.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (vvoronko@redhat.com), skipping review request.

In response to this:

Bug 2017564: Prepend to search domains instead of replacing

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 openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Nov 4, 2021
@cybertron
Copy link
Member Author

cybertron commented Nov 4, 2021

/hold cancel

Results from my local test run:

search ostest.test.metalkube.org
nameserver 192.168.111.23
nameserver 192.168.111.1

And with a custom search domain and server added:

search ostest.test.metalkube.org nemebean.com
nameserver 192.168.111.23
nameserver 11.1.1.1
nameserver 192.168.111.1

Everything seems to be working as intended. Except that GitHub formatting is eating the "Generated by" comment. :-)

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 4, 2021
@cybertron
Copy link
Member Author

/retest-required

1 similar comment
@cybertron
Copy link
Member Author

/retest-required

@cybertron
Copy link
Member Author

@rvanderp3
Copy link
Contributor

/test e2e-vsphere

@cybertron
Copy link
Member Author

/retest-required
/test e2e-vsphere

@kikisdeliveryservice
Copy link
Contributor

@rvanderp3 e2e-vsphere is pretty red but e2e-vsphere-upgrade is passing

https://prow.ci.openshift.org/job-history/gs/origin-ci-test/pr-logs/directory/pull-ci-openshift-machine-config-operator-master-e2e-vsphere

should we be waiting for a green run on that?

@kikisdeliveryservice
Copy link
Contributor

/retest-required
/test e2e-vsphere

Copy link
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 9, 2021
@jcpowermac
Copy link
Contributor

/lgtm

Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the vsphere job has now indeed passed :)

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 9, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cybertron, jcpowermac, kikisdeliveryservice, mandre

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 [kikisdeliveryservice]

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 9, 2021
@openshift-bot
Copy link
Contributor

/retest-required

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

3 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 9, 2021

@cybertron: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-upgrade-single-node e1fbf07 link false /test e2e-aws-upgrade-single-node
ci/prow/e2e-aws-workers-rhel7 e1fbf07 link false /test e2e-aws-workers-rhel7
ci/prow/e2e-aws-workers-rhel8 e1fbf07 link false /test e2e-aws-workers-rhel8
ci/prow/e2e-aws-serial e1fbf07 link false /test e2e-aws-serial
ci/prow/e2e-aws-disruptive e1fbf07 link false /test e2e-aws-disruptive

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
Copy link
Contributor

/retest-required

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

8 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-merge-robot openshift-merge-robot merged commit 0abf68a into openshift:master Nov 10, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2021

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

Bugzilla bug 2017564 has been moved to the MODIFIED state.

In response to this:

Bug 2017564: Prepend to search domains instead of replacing

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.

@creydr
Copy link
Member

creydr commented Feb 25, 2022

/cherry-pick release-4.9

@openshift-cherrypick-robot

@creydr: new pull request created: #2965

In response to this:

/cherry-pick release-4.9

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent 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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants