diff --git a/cli/cmd/checkRunner.go b/cli/cmd/checkRunner.go index 4583a86e2..c7caa2dea 100644 --- a/cli/cmd/checkRunner.go +++ b/cli/cmd/checkRunner.go @@ -101,7 +101,7 @@ func checkKubernetesVersion(kubernetesVersion *semver.SemVersion) bool { func checkServerConnection(kubernetesProvider *kubernetes.Provider) bool { logger.Log.Infof("\nAPI-server-connectivity\n--------------------") - serverUrl := GetApiServerUrl() + serverUrl := GetApiServerUrl(config.Config.Tap.GuiPort) apiServerProvider := apiserver.NewProvider(serverUrl, 1, apiserver.DefaultTimeout) if err := apiServerProvider.TestConnection(); err == nil { diff --git a/cli/cmd/common.go b/cli/cmd/common.go index 52707b70c..8b9435e6e 100644 --- a/cli/cmd/common.go +++ b/cli/cmd/common.go @@ -23,12 +23,12 @@ import ( "github.com/up9inc/mizu/shared/logger" ) -func GetApiServerUrl() string { - return fmt.Sprintf("http://%s", kubernetes.GetMizuApiServerProxiedHostAndPath(config.Config.Tap.GuiPort)) +func GetApiServerUrl(port uint16) string { + return fmt.Sprintf("http://%s", kubernetes.GetMizuApiServerProxiedHostAndPath(port)) } -func startProxyReportErrorIfAny(kubernetesProvider *kubernetes.Provider, ctx context.Context, cancel context.CancelFunc) { - httpServer, err := kubernetes.StartProxy(kubernetesProvider, config.Config.Tap.ProxyHost, config.Config.Tap.GuiPort, config.Config.MizuResourcesNamespace, kubernetes.ApiServerPodName, cancel) +func startProxyReportErrorIfAny(kubernetesProvider *kubernetes.Provider, ctx context.Context, cancel context.CancelFunc, port uint16) { + httpServer, err := kubernetes.StartProxy(kubernetesProvider, config.Config.Tap.ProxyHost, port, config.Config.MizuResourcesNamespace, kubernetes.ApiServerPodName, cancel) if err != nil { logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Error occured while running k8s proxy %v\n"+ "Try setting different port by using --%s", errormessage.FormatError(err), configStructs.GuiPortTapName)) @@ -36,7 +36,7 @@ func startProxyReportErrorIfAny(kubernetesProvider *kubernetes.Provider, ctx con return } - apiProvider = apiserver.NewProvider(GetApiServerUrl(), apiserver.DefaultRetries, apiserver.DefaultTimeout) + apiProvider = apiserver.NewProvider(GetApiServerUrl(port), apiserver.DefaultRetries, apiserver.DefaultTimeout) if err := apiProvider.TestConnection(); err != nil { logger.Log.Debugf("Couldn't connect using proxy, stopping proxy and trying to create port-forward") if err := httpServer.Shutdown(ctx); err != nil { @@ -44,14 +44,14 @@ func startProxyReportErrorIfAny(kubernetesProvider *kubernetes.Provider, ctx con } podRegex, _ := regexp.Compile(kubernetes.ApiServerPodName) - if _, err := kubernetes.NewPortForward(kubernetesProvider, config.Config.MizuResourcesNamespace, podRegex, config.Config.Tap.GuiPort, ctx, cancel); err != nil { + if _, err := kubernetes.NewPortForward(kubernetesProvider, config.Config.MizuResourcesNamespace, podRegex, port, ctx, cancel); err != nil { logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Error occured while running port forward %v\n"+ "Try setting different port by using --%s", errormessage.FormatError(err), configStructs.GuiPortTapName)) cancel() return } - apiProvider = apiserver.NewProvider(GetApiServerUrl(), apiserver.DefaultRetries, apiserver.DefaultTimeout) + apiProvider = apiserver.NewProvider(GetApiServerUrl(port), apiserver.DefaultRetries, apiserver.DefaultTimeout) if err := apiProvider.TestConnection(); err != nil { logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Couldn't connect to API server, for more info check logs at %s", fsUtils.GetLogFilePath())) cancel() diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index db7c9c594..5e37135bc 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -45,7 +45,7 @@ var apiProvider *apiserver.Provider func RunMizuTap() { state.startTime = time.Now() - apiProvider = apiserver.NewProvider(GetApiServerUrl(), apiserver.DefaultRetries, apiserver.DefaultTimeout) + apiProvider = apiserver.NewProvider(GetApiServerUrl(config.Config.Tap.GuiPort), apiserver.DefaultRetries, apiserver.DefaultTimeout) var err error var serializedValidationRules string @@ -421,7 +421,7 @@ func watchApiServerEvents(ctx context.Context, kubernetesProvider *kubernetes.Pr } func postApiServerStarted(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc) { - startProxyReportErrorIfAny(kubernetesProvider, ctx, cancel) + startProxyReportErrorIfAny(kubernetesProvider, ctx, cancel, config.Config.Tap.GuiPort) options, _ := getMizuApiFilteringOptions() if err := startTapperSyncer(ctx, cancel, kubernetesProvider, state.targetNamespaces, *options, state.startTime); err != nil { @@ -429,7 +429,7 @@ func postApiServerStarted(ctx context.Context, kubernetesProvider *kubernetes.Pr cancel() } - url := GetApiServerUrl() + url := GetApiServerUrl(config.Config.Tap.GuiPort) logger.Log.Infof("Mizu is available at %s", url) if !config.Config.HeadlessMode { uiUtils.OpenBrowser(url) diff --git a/cli/cmd/viewRunner.go b/cli/cmd/viewRunner.go index 8161ddbe2..9a4101edd 100644 --- a/cli/cmd/viewRunner.go +++ b/cli/cmd/viewRunner.go @@ -39,7 +39,7 @@ func runMizuView() { return } - url = GetApiServerUrl() + url = GetApiServerUrl(config.Config.View.GuiPort) response, err := http.Get(fmt.Sprintf("%s/", url)) if err == nil && response.StatusCode == 200 { @@ -47,7 +47,7 @@ func runMizuView() { return } logger.Log.Infof("Establishing connection to k8s cluster...") - startProxyReportErrorIfAny(kubernetesProvider, ctx, cancel) + startProxyReportErrorIfAny(kubernetesProvider, ctx, cancel, config.Config.View.GuiPort) } apiServerProvider := apiserver.NewProvider(url, apiserver.DefaultRetries, apiserver.DefaultTimeout)