Skip to content

Commit 15dfc5c

Browse files
authored
Merge pull request #6830 from josedonizetti/kic-fix-service-list
kic: fix service list for docker on osx
2 parents 3f34e68 + 954f5a6 commit 15dfc5c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

cmd/minikube/cmd/service_list.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,18 @@ var serviceListCmd = &cobra.Command{
6666
if len(serviceURL.URLs) == 0 {
6767
data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "No node port"})
6868
} else {
69-
data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "", strings.Join(serviceURL.URLs, "\n")})
69+
serviceURLs := strings.Join(serviceURL.URLs, "\n")
7070

71-
}
71+
// if we are running Docker on OSX we empty the internal service URLs
72+
if runtime.GOOS == "darwin" && cfg.Driver == oci.Docker {
73+
serviceURLs = ""
74+
}
7275

73-
}
74-
service.PrintServiceList(os.Stdout, data)
75-
if runtime.GOOS == "darwin" && cfg.Driver == oci.Docker {
76-
out.FailureT("Accessing service is not implemented yet for docker driver on Mac.\nThe following issue is tracking the in progress work::\nhttps://github.com/kubernetes/minikube/issues/6778")
77-
exit.WithCodeT(exit.Failure, "Not yet implemented for docker driver on MacOS.")
76+
data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "", serviceURLs})
77+
}
7878
}
7979

80+
service.PrintServiceList(os.Stdout, data)
8081
},
8182
}
8283

0 commit comments

Comments
 (0)