Merge pull request #16839 from spowelljr/oneTunnelPerProfile

medyagh · web-flow · commit 69b009fc59db · 2023-07-10T11:39:11.000-07:00
tunnel: Allow one tunnel per profile
diff --git a/cmd/minikube/cmd/tunnel.go b/cmd/minikube/cmd/tunnel.go
@@ -76,7 +76,7 @@ var tunnelCmd = &cobra.Command{
 			}
 		}
 
-		mustLockOrExit()
+		mustLockOrExit(cname)
 		defer cleanupLock()
 
 		// Tunnel uses the k8s clientset to query the API server for services in the LoadBalancerEmulator.
@@ -131,8 +131,8 @@ func cleanupLock() {
 	}
 }
 
-func mustLockOrExit() {
-	tunnelLockPath := filepath.Join(localpath.MiniPath(), ".tunnel_lock")
+func mustLockOrExit(profile string) {
+	tunnelLockPath := filepath.Join(localpath.Profile(profile), ".tunnel_lock")
 
 	lockHandle = fslock.New(tunnelLockPath)
 	err := lockHandle.TryLock()

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ var tunnelCmd = &cobra.Command{`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`- mustLockOrExit()`
	`79`	`+ mustLockOrExit(cname)`
`80`	`80`	`defer cleanupLock()`
`81`	`81`
`82`	`82`	`// Tunnel uses the k8s clientset to query the API server for services in the LoadBalancerEmulator.`
`@@ -131,8 +131,8 @@ func cleanupLock() {`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`-func mustLockOrExit() {`
`135`		`- tunnelLockPath := filepath.Join(localpath.MiniPath(), ".tunnel_lock")`
	`134`	`+func mustLockOrExit(profile string) {`
	`135`	`+ tunnelLockPath := filepath.Join(localpath.Profile(profile), ".tunnel_lock")`
`136`	`136`
`137`	`137`	`lockHandle = fslock.New(tunnelLockPath)`
`138`	`138`	`err := lockHandle.TryLock()`