-
Notifications
You must be signed in to change notification settings - Fork 177
Conversation
Codecov Report
@@ Coverage Diff @@
## master #479 +/- ##
==========================================
- Coverage 69.36% 68.84% -0.53%
==========================================
Files 50 51 +1
Lines 2566 2645 +79
==========================================
+ Hits 1780 1821 +41
- Misses 548 584 +36
- Partials 238 240 +2
Continue to review full report at Codecov.
|
44d0128
to
1121210
Compare
Removed the [WIP] moniker, but it is still referencing @jcsirot working branch. Not sure if we can merge it then, but it dramatically improve usability with Docker Desktop |
Gopkg.toml
Outdated
@@ -39,8 +39,12 @@ required = ["github.com/wadey/gocovmerge"] | |||
### Waiting on PR https://github.com/docker/cli/pull/1718 and https://github.com/docker/cli/pull/1690 to land on cli ### | |||
[[override]] | |||
name = "github.com/docker/cli" | |||
source = "https://github.com/chris-crone/cli" | |||
revision="d6bfd7e5592dad85969516c131d33910fa5ebd58" | |||
source = "https://github.com/jcsirot/cli" |
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.
Should be rebased on top of #491
b3b4f96
to
efe5339
Compare
Just rebased on top of #491 |
} | ||
hostName := hostURL.Hostname() | ||
switch hostName { | ||
case "localhost", "127.0.0.1": |
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.
Dumb question but... What about ipv6 ? Shouldn't we also add it ? ::1
AFAIR
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.
Or maybe that's a linuxkit only thing, and only available with ipv4
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.
the kubeconfig file being generated by docker-desktop, I guess they will keep using localhost/127.0.0.1... but I can do it yes
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.
LGTM
efe5339
to
b5574b7
Compare
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
b5574b7
to
c0ca8ee
Compare
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.
LGTM
Now based on #482
- What I did
With Docker Desktop, contexts that target the local daemon/kubernetes
endpoints need to be rewriten, because they are not usable from within a
container (for swarm on windows, npipe:////./pipe/docker_engine must be
renamed to unix:///var/run/docker.sock, for both mac and windows,
Kubernetes Host https://localhost:* must be renamed to https://:6443)
- How I did it
Introduced a "proxy" context store handling those cases
- How to verify it
Unit-tests included, still need to figure how to e2e test that though.
- Description for the changelog
Docker-Desktop users don't have to create a "cnab" context anymore