Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@gjkim42
Copy link
Contributor

@gjkim42 gjkim42 commented Aug 13, 2021

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR makes cri-o allow ExpandedDNSConfig

Which issue(s) this PR fixes:

Fixes #5198

Special notes for your reviewer:

Does this PR introduce a user-facing change?

cri-o now does not limit the DNS search paths.

@gjkim42 gjkim42 requested review from mrunalp and runcom as code owners August 13, 2021 06:17
@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: no Indicates the PR's author has not DCO signed all their commits. kind/feature Categorizes issue or PR as related to a new feature. labels Aug 13, 2021
@openshift-ci openshift-ci bot requested a review from vrothberg August 13, 2021 06:17
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 13, 2021

Hi @gjkim42. Thanks for your PR.

I'm waiting for a cri-o member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 13, 2021
@gjkim42 gjkim42 force-pushed the allow-expanded-dns-config branch from 46d5907 to f58eee0 Compare August 13, 2021 06:18
@openshift-ci openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. and removed dco-signoff: no Indicates the PR's author has not DCO signed all their commits. labels Aug 13, 2021
@gjkim42 gjkim42 force-pushed the allow-expanded-dns-config branch from f58eee0 to 3bc3af5 Compare August 13, 2021 06:53
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/ok-to-test

Thank you @gjkim42! 🙏

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 16, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gjkim42, saschagrunert

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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 Aug 16, 2021
@codecov
Copy link

codecov bot commented Aug 16, 2021

Codecov Report

Merging #5199 (b16eec5) into master (c53e78f) will decrease coverage by 0.15%.
The diff coverage is 25.25%.

❗ Current head b16eec5 differs from pull request most recent head 06f0944. Consider uploading reports for the commit 06f0944 to get more accurate results

@@            Coverage Diff             @@
##           master    #5199      +/-   ##
==========================================
- Coverage   44.28%   44.13%   -0.16%     
==========================================
  Files         112      113       +1     
  Lines       11563    11651      +88     
==========================================
+ Hits         5121     5142      +21     
- Misses       5955     6022      +67     
  Partials      487      487              

@gjkim42
Copy link
Contributor Author

gjkim42 commented Aug 16, 2021

/retest

@@ -0,0 +1,4 @@
search 1.com 2.com 3.com 4.com 5.com 6.com 7.com
Copy link
Member

Choose a reason for hiding this comment

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

can we clean this up after the test?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we've already cleaned the output resolv.conf file up after each test.

Expect(sandbox.ParseDNSOptions(c.Servers, c.Searches, c.Options, c.Path)).To(BeNil())
defer os.Remove(c.Path)

Am I missing something?

Copy link
Member

Choose a reason for hiding this comment

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

ah the test as it currently is is not quite right. If we do os.Remove(c.Path) after calling Expect(ParseDNSOptions...), it's possible ParseDNSOptions failed after creating the file but before creating. can you switch the order of the defer and Expect calls, and remove this file from the commit?

Copy link
Contributor Author

@gjkim42 gjkim42 Aug 18, 2021

Choose a reason for hiding this comment

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

can you switch the order of the defer and Expect calls

That is a good point. Done.

and remove this file from the commit?

I think this file is a test data as fixtures/resolv.conf is. (This file refers to c.Want, not c.Path)

Should we have to refactor the test to be able to test without these files?
Let me know if that is what you request.

Copy link
Member

Choose a reason for hiding this comment

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

for some reason I didn't see the fixtures directory when I looked before. We can have the refactor as a follow up (which I'd love if you wanted to take that on 😃 )

@gjkim42 gjkim42 force-pushed the allow-expanded-dns-config branch from 3bc3af5 to 151dcfa Compare August 17, 2021 00:49
@haircommander haircommander added this to the 1.22 milestone Aug 17, 2021
@haircommander
Copy link
Member

waiting on the gh action to run through, and I will tag after. Thank you for your work @gjkim42 !

@haircommander
Copy link
Member

/lgtm

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

openshift-ci bot commented Aug 18, 2021

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

Test name Commit Details Rerun command
ci/openshift-jenkins/e2e_crun_cgroupv2 06f0944 link /test e2e_cgroupv2

Full PR test history. Your PR dashboard.

Details

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.

@haircommander
Copy link
Member

/retest-required

@openshift-merge-robot openshift-merge-robot merged commit 56fb46e into cri-o:master Aug 18, 2021
@gjkim42 gjkim42 deleted the allow-expanded-dns-config branch August 18, 2021 20:59
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. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support more DNS search paths

4 participants