containerd
containerd copied to clipboard
containerd
CRI: An empty DNSConfig != unspecified
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 https://github.com/kubernetes/kubernetes/issues/120748
@aojea @fungaren
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.
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.
@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".
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.
@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".
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.