Skip to content
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.

Sign up for GitHub

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

Jump to bottom

WSL: Use dnsmasq #1302

Merged
merged 6 commits into from
Feb 8, 2022
Merged

WSL: Use dnsmasq #1302

merged 6 commits into from
Feb 8, 2022

Conversation

mook-as
Copy link
Contributor

@mook-as mook-as commented Jan 21, 2022

This adds dnsmasq on Windows, and uses it for the rancher-desktop WSL distribution. It mostly forwards to the normal nameserver (by reading the resolv.conf from the data distribution), but additionally interprets /etc/hosts where we add the fake hostnames host.docker.internal and host.minikube.internal.

Requires rancher-sandbox/rancher-desktop-wsl-distro#23.
Fixes #893.

@mook-as mook-as marked this pull request as ready for review January 24, 2022 19:01
@jandubois
Copy link
Member

jandubois commented Jan 24, 2022 •
edited
Loading

This PR defines the names host.docker.internal and host.minikube.internal.

We should use host.rancher-desktop.internal for compatibility with the lima version (which defines host.lima.internal, and we add host.rancher-desktop.internal, and host.docker.internal). The "lima" name is upstream, so we keep it, but obviously don't want it on the WSL2 version.

We should just add host.rancher-desktop.internal as the canonical name (also to be used in docs), and add host.docker.internal for compatibility reasons. I don't see a need to define host.minikube.internal at all.

@jandubois jandubois mentioned this pull request Feb 1, 2022
Merged
jandubois
jandubois requested changes Feb 1, 2022
View reviewed changes
Copy link
Member

@jandubois jandubois left a comment

Choose a reason for hiding this comment

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

Bump WSL distro to v0.14 and make sure this PR isn't merged until after #1429 is merged.

scripts/download/wsl.mjs Outdated
@@ -8,7 +8,7 @@ import path from 'path';
import { download } from '../lib/download.mjs';

export default async function main() {
const v = '0.12';
const v = '0.13';
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
const v = '0.13';
const v = '0.14';

Assuming #1429 will get merged before this PR means we will be at v0.12.1, which includes a nerdctl bump to 0.16.1 for both the Lima Alpine image and the WSL distro.

Switching the WSL distro to v0.13 afterwards would revert nerdctl for WSL to 0.16.0 while keeping it for the Alpine ISO at 0.16.1.

@mook-as
WSL: Use a built-in wsl.conf for the data distro.
9ca4691 
This stops copying the wsl.conf over from the main WSL distribution, so
that we can provide different contents in the main one.

Signed-off-by: Mark Yen <mark.yen@suse.com>
@mook-as
WSL: Customize /etc/hosts
2160b77 
This edits /etc/hosts on the main distribution to add entries for
host.docker.internal and host.minikube.internal for compatibility.  We copy
over the /etc/hosts file in the data distribution (which we still ask WSL
to generate), and then add lines we need.

Note that this doesn't appear to actually affect any containers, as moby
uses an internal file to generate /etc/hosts.

Signed-off-by: Mark Yen <mark.yen@suse.com>
@mook-as
WSL: Use dnsmasq as the DNS server.
0889463 
This allows us to add entries to /etc/hosts and allow containers to resolve
them.

Signed-off-by: Mark Yen <mark.yen@suse.com>
@mook-as
WSL: bump distribution to 0.14
6725c91 
Signed-off-by: Mark Yen <mark.yen@suse.com>
@mook-as
WSL: Add host.rancher-desktop.internal.
1b57efb 
Also drop minikube.
rancher-sandbox#1302 (comment)

Signed-off-by: Mark Yen <mark.yen@suse.com>
@mook-as mook-as requested a review from jandubois February 4, 2022 00:12
@gaktive gaktive requested a review from ericpromislow February 7, 2022 19:23
ericpromislow
ericpromislow requested changes Feb 8, 2022
View reviewed changes
Copy link
Contributor

@ericpromislow ericpromislow left a comment

Choose a reason for hiding this comment

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

One change to align with a recent merged PR and a nit or two

@mook-as
WSL: Fix typo.
c6ac2d8 
Signed-off-by: Mark Yen <mark.yen@suse.com>
@mook-as mook-as requested a review from ericpromislow February 8, 2022 00:18
ericpromislow
ericpromislow approved these changes Feb 8, 2022
View reviewed changes
Copy link
Contributor

@ericpromislow ericpromislow left a comment

Choose a reason for hiding this comment

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

Looks fine now

@mook-as mook-as merged commit d34cc89 into rancher-sandbox:main Feb 8, 2022
@mook-as mook-as deleted the wsl-dnsmasq branch February 8, 2022 01:52
@gaktive gaktive mentioned this pull request Feb 8, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jandubois jandubois jandubois approved these changes

@ericpromislow ericpromislow ericpromislow approved these changes

Assignees
No one assigned
Labels
platform/windows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

WSL: make host.docker.internal work
3 participants
@mook-as @jandubois @ericpromislow