Remove ping, was added in merge conflict

afbjorklund · afbjorklund · commit 47fe5b2822d3 · 2019-11-02T08:59:19.000+01:00
Supposed to be removed in 361222f, along with some other random changes to comments and such.
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -1024,7 +1024,6 @@ func validateNetwork(h *host.Host, r command.Runner) string {
 	}
 
 	tryLookup(r)
-	tryPing(r)
 	tryRegistry(r)
 	return ip
 }
@@ -1058,13 +1057,6 @@ func tryLookup(r command.Runner) {
 	}
 }
 
-func tryPing(r command.Runner) {
-	// Try both UDP and ICMP to assert basic external connectivity
-	if err := r.Run("nslookup k8s.io 8.8.8.8 || nslookup k8s.io 1.1.1.1 || ping -c1 8.8.8.8"); err != nil {
-		out.WarningT("VM is unable to directly connect to the internet: {{.error}}", out.V{"error": err})
-	}
-}
-
 func tryRegistry(r command.Runner) {
 	// Try an HTTPS connection to the image repository
 	proxy := os.Getenv("HTTPS_PROXY")

Original file line number	Diff line number	Diff line change
`@@ -1024,7 +1024,6 @@ func validateNetwork(h *host.Host, r command.Runner) string {`
`1024`	`1024`	`}`
`1025`	`1025`
`1026`	`1026`	`tryLookup(r)`
`1027`		`- tryPing(r)`
`1028`	`1027`	`tryRegistry(r)`
`1029`	`1028`	`return ip`
`1030`	`1029`	`}`
`@@ -1058,13 +1057,6 @@ func tryLookup(r command.Runner) {`
`1058`	`1057`	`}`
`1059`	`1058`	`}`
`1060`	`1059`
`1061`		`-func tryPing(r command.Runner) {`
`1062`		`- // Try both UDP and ICMP to assert basic external connectivity`
`1063`		`- if err := r.Run("nslookup k8s.io 8.8.8.8 \|\| nslookup k8s.io 1.1.1.1 \|\| ping -c1 8.8.8.8"); err != nil {`
`1064`		`- out.WarningT("VM is unable to directly connect to the internet: {{.error}}", out.V{"error": err})`
`1065`		`- }`
`1066`		`-}`
`1067`		`-`
`1068`	`1060`	`func tryRegistry(r command.Runner) {`
`1069`	`1061`	`// Try an HTTPS connection to the image repository`
`1070`	`1062`	`proxy := os.Getenv("HTTPS_PROXY")`