-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Allow expanded DNS configuration #5199
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
Allow expanded DNS configuration #5199
Conversation
|
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 Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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. |
46d5907 to
f58eee0
Compare
f58eee0 to
3bc3af5
Compare
saschagrunert
left a comment
There was a problem hiding this 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! 🙏
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Codecov Report
@@ 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 |
|
/retest |
| @@ -0,0 +1,4 @@ | |||
| search 1.com 2.com 3.com 4.com 5.com 6.com 7.com | |||
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
cri-o/pkg/sandbox/infra_test.go
Lines 42 to 43 in c53e78f
| Expect(sandbox.ParseDNSOptions(c.Servers, c.Searches, c.Options, c.Path)).To(BeNil()) | |
| defer os.Remove(c.Path) |
Am I missing something?
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 😃 )
Signed-off-by: Gunju Kim <[email protected]>
3bc3af5 to
151dcfa
Compare
Signed-off-by: Gunju Kim <[email protected]>
|
waiting on the gh action to run through, and I will tag after. Thank you for your work @gjkim42 ! |
|
/lgtm |
|
@gjkim42: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
/retest-required |
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?