Skip to content

CRI: An empty DNSConfig != unspecified#9730

Merged
dmcgowan merged 1 commit intocontainerd:mainfrom
thockin:main
Feb 2, 2024
Merged

CRI: An empty DNSConfig != unspecified#9730
dmcgowan merged 1 commit intocontainerd:mainfrom
thockin:main

Conversation

@thockin
Copy link
Copy Markdown
Contributor

@thockin thockin commented Feb 1, 2024

If we find that DNSConfig is provided and empty (not nil), we should not
replace it with the host's resolv.conf.

Also adds tests.

Fixes kubernetes/kubernetes#120748

@aojea @fungaren

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Feb 1, 2024

Hi @thockin. Thanks for your PR.

I'm waiting for a containerd 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.

@thockin thockin mentioned this pull request Feb 1, 2024
Closed
@samuelkarp
Copy link
Copy Markdown
Member

samuelkarp commented Feb 1, 2024

/ok-to-test
/area cri

@k8s-ci-robot k8s-ci-robot added ok-to-test area/cri Container Runtime Interface (CRI) and removed needs-ok-to-test labels Feb 1, 2024
@thockin
CRI: An empty DNSConfig != unspecified
6e365e9 
If we find that DNSConfig is provided and empty (not nil), we should not
replace it with the host's resolv.conf.

Also adds tests.

Signed-off-by: Tim Hockin <[email protected]>
@dmcgowan dmcgowan added this to the 2.0 milestone Feb 2, 2024
@dmcgowan dmcgowan added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Feb 2, 2024
@aojea
Copy link
Copy Markdown
Contributor

aojea commented Feb 2, 2024

/lgtm

@dmcgowan dmcgowan added this pull request to the merge queue Feb 2, 2024
Merged via the queue into containerd:main with commit db1e16d Feb 2, 2024
@roman-kiselenko roman-kiselenko mentioned this pull request Feb 9, 2024
Merged
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Apr 23, 2024

/cherry-pick release/1.7

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Apr 23, 2024

/cherrypick release/1.7

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Apr 23, 2024

@AkihiroSuda: #9730 failed to apply on top of branch "release/1.7":

Applying: CRI: An empty DNSConfig != unspecified
Using index info to reconstruct a base tree...
A	pkg/cri/server/podsandbox/sandbox_run_linux.go
A	pkg/cri/server/podsandbox/sandbox_run_linux_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cri/server/sandbox_run_linux_test.go
CONFLICT (content): Merge conflict in pkg/cri/server/sandbox_run_linux_test.go
Auto-merging pkg/cri/sbserver/podsandbox/sandbox_run_linux.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 CRI: An empty DNSConfig != unspecified
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release/1.7

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.

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Apr 23, 2024

@AkihiroSuda: #9730 failed to apply on top of branch "release/1.7":

Applying: CRI: An empty DNSConfig != unspecified
Using index info to reconstruct a base tree...
A	pkg/cri/server/podsandbox/sandbox_run_linux.go
A	pkg/cri/server/podsandbox/sandbox_run_linux_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cri/server/sandbox_run_linux_test.go
CONFLICT (content): Merge conflict in pkg/cri/server/sandbox_run_linux_test.go
Auto-merging pkg/cri/sbserver/podsandbox/sandbox_run_linux.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 CRI: An empty DNSConfig != unspecified
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick release/1.7

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.

This was referenced Jul 15, 2024
Merged
Merged
@samuelkarp samuelkarp added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch and removed cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jul 31, 2024
@samuelkarp samuelkarp added the cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch label Jul 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@estesp estesp estesp approved these changes

@dcantah dcantah dcantah approved these changes

Assignees

No one assigned

Labels

area/cri Container Runtime Interface (CRI) cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch ok-to-test size/M

Projects

Pull Request Review
Archived in project

Milestone

2.0

Development

Successfully merging this pull request may close these issues.

Kubelet didn't respect --resolv-conf when resolv.conf is empty or full of comments

9 participants

@thockin @k8s-ci-robot @samuelkarp @aojea @AkihiroSuda @k8s-infra-cherrypick-robot @dmcgowan @estesp @dcantah