go.mod, vendor: use github.com/cilium/dns fork directly #27582
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tklauser
added
kind/cleanup
|
/test |
tklauser
force-pushed
the
pr/tklauser/dns-replace-be-gone
branch
from
187d417
to
db13dd4
Compare
|
/test |
rolinh
approved these changes
Aug 18, 2023
jrajahalme
approved these changes
Aug 22, 2023
tklauser
force-pushed
the
pr/tklauser/dns-replace-be-gone
branch
from
db13dd4
to
f6e2744
Compare
|
/test |
|
Rebased to resolve merge conflict. |
tklauser
requested review from
aanm and
borkmann
and removed request for
nathanjsweet
borkmann
approved these changes
Aug 25, 2023
aanm
approved these changes
Aug 25, 2023
We have been maintaining and using that fork for a long time and it looks like the custom changes won't make it upstream any time soon. There are no other vendored dependencies using miekg/dns, so switching to the cilium/dns fork shouldn't have any side effects. The fork's module name was changed to match its import path in cilium/dns#4. Let's replace the github.com/miekg/dns import path by github.com/cilium/dns to get rid of another replace directive in go.mod and thus make life a tiny bit easier for downstream packages importing github.com/cilium/cilium. Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser
force-pushed
the
pr/tklauser/dns-replace-be-gone
branch
from
f6e2744
to
1c22d85
Compare
|
/test |
maintainer-s-little-helper
bot
added
the
ready-to-merge
2 tasks
This was referenced Nov 9, 2023
jrajahalme
added
backport-pending/1.12
backport-pending/1.13
github-actions
bot
added
backport-done/1.14
github-actions
bot
added
backport-done/1.13
This was referenced Nov 12, 2023
Closed
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We have been maintaining and using that fork for a long time and it looks like the custom changes won't make it upstream any time soon.
There are no other vendored dependencies using miekg/dns, so switching to the cilium/dns fork shouldn't have any side effects. The fork's module name was changed to match its import path in cilium/dns#4.
Let's replace the
github.com/miekg/dnsimport path bygithub.com/cilium/dnsto get rid of anotherreplacedirective ingo.modand thus make life a tiny bit easier for downstream packages importinggithub.com/cilium/cilium.