Merge pull request #6830 from josedonizetti/kic-fix-service-list

kic: fix service list for docker on osx
kubernetes · Feb 28, 2020 · 15dfc5c · 15dfc5c
2 parents 3f34e68 + 954f5a6
commit 15dfc5c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/cmd/minikube/cmd/service_list.go b/cmd/minikube/cmd/service_list.go
@@ -66,17 +66,18 @@ var serviceListCmd = &cobra.Command{
 			if len(serviceURL.URLs) == 0 {
 				data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "No node port"})
 			} else {
-				data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "", strings.Join(serviceURL.URLs, "\n")})
+				serviceURLs := strings.Join(serviceURL.URLs, "\n")
 
-			}
+				// if we are running Docker on OSX we empty the internal service URLs
+				if runtime.GOOS == "darwin" && cfg.Driver == oci.Docker {
+					serviceURLs = ""
+				}
 
-		}
-		service.PrintServiceList(os.Stdout, data)
-		if runtime.GOOS == "darwin" && cfg.Driver == oci.Docker {
-			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")
-			exit.WithCodeT(exit.Failure, "Not yet implemented for docker driver on MacOS.")
+				data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "", serviceURLs})
+			}
 		}
 
+		service.PrintServiceList(os.Stdout, data)
 	},
 }