From f4db282fcca3b9c7c4752f1ca0d5672b892b8a27 Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Sat, 26 Nov 2022 07:31:24 +0300 Subject: [PATCH] :art: Have the service name and pod name distinction --- cmd/check/kubernetesResources.go | 4 ++-- cmd/check/serverConnection.go | 2 +- cmd/viewRunner.go | 6 +++--- resources/cleanResources.go | 4 ++-- resources/createResources.go | 8 +++++--- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cmd/check/kubernetesResources.go b/cmd/check/kubernetesResources.go index 73875827a..18089ad56 100644 --- a/cmd/check/kubernetesResources.go +++ b/cmd/check/kubernetesResources.go @@ -36,8 +36,8 @@ func KubernetesResources(ctx context.Context, kubernetesProvider *kubernetes.Pro allResourcesExist = checkResourceExist(kubernetes.ClusterRoleBindingName, "cluster role binding", exist, err) && allResourcesExist } - exist, err = kubernetesProvider.DoesServiceExist(ctx, config.Config.KubesharkResourcesNamespace, kubernetes.ApiServerPodName) - allResourcesExist = checkResourceExist(kubernetes.ApiServerPodName, "service", exist, err) && allResourcesExist + exist, err = kubernetesProvider.DoesServiceExist(ctx, config.Config.KubesharkResourcesNamespace, kubernetes.ApiServerServiceName) + allResourcesExist = checkResourceExist(kubernetes.ApiServerServiceName, "service", exist, err) && allResourcesExist allResourcesExist = checkPodResourcesExist(ctx, kubernetesProvider) && allResourcesExist diff --git a/cmd/check/serverConnection.go b/cmd/check/serverConnection.go index 43e1a00d0..b07c0d9a5 100644 --- a/cmd/check/serverConnection.go +++ b/cmd/check/serverConnection.go @@ -46,7 +46,7 @@ func checkProxy(serverUrl string, kubernetesProvider *kubernetes.Provider) error ctx, cancel := context.WithCancel(context.Background()) defer cancel() - httpServer, err := kubernetes.StartProxy(kubernetesProvider, config.Config.Tap.ProxyHost, config.Config.Hub.PortForward.SrcPort, config.Config.Hub.PortForward.DstPort, config.Config.KubesharkResourcesNamespace, kubernetes.ApiServerPodName, cancel) + httpServer, err := kubernetes.StartProxy(kubernetesProvider, config.Config.Tap.ProxyHost, config.Config.Hub.PortForward.SrcPort, config.Config.Hub.PortForward.DstPort, config.Config.KubesharkResourcesNamespace, kubernetes.ApiServerServiceName, cancel) if err != nil { return err } diff --git a/cmd/viewRunner.go b/cmd/viewRunner.go index c2c61b4bf..792d6a259 100644 --- a/cmd/viewRunner.go +++ b/cmd/viewRunner.go @@ -26,14 +26,14 @@ func runKubesharkView() { url := config.Config.View.Url if url == "" { - exists, err := kubernetesProvider.DoesServiceExist(ctx, config.Config.KubesharkResourcesNamespace, kubernetes.ApiServerPodName) + exists, err := kubernetesProvider.DoesServiceExist(ctx, config.Config.KubesharkResourcesNamespace, kubernetes.ApiServerServiceName) if err != nil { log.Printf("Failed to found kubeshark service %v", err) cancel() return } if !exists { - log.Printf("%s service not found, you should run `kubeshark tap` command first", kubernetes.ApiServerPodName) + log.Printf("%s service not found, you should run `kubeshark tap` command first", kubernetes.ApiServerServiceName) cancel() return } @@ -42,7 +42,7 @@ func runKubesharkView() { response, err := http.Get(fmt.Sprintf("%s/", url)) if err == nil && response.StatusCode == 200 { - log.Printf("Found a running service %s and open port %d", kubernetes.ApiServerPodName, config.Config.Front.PortForward.SrcPort) + log.Printf("Found a running service %s and open port %d", kubernetes.ApiServerServiceName, config.Config.Front.PortForward.SrcPort) return } log.Printf("Establishing connection to k8s cluster...") diff --git a/resources/cleanResources.go b/resources/cleanResources.go index 2f3f3943b..836050ec5 100644 --- a/resources/cleanResources.go +++ b/resources/cleanResources.go @@ -90,8 +90,8 @@ func waitUntilNamespaceDeleted(ctx context.Context, cancel context.CancelFunc, k func cleanUpRestrictedMode(ctx context.Context, kubernetesProvider *kubernetes.Provider, kubesharkResourcesNamespace string) []string { leftoverResources := make([]string, 0) - if err := kubernetesProvider.RemoveService(ctx, kubesharkResourcesNamespace, kubernetes.ApiServerPodName); err != nil { - resourceDesc := fmt.Sprintf("Service %s in namespace %s", kubernetes.ApiServerPodName, kubesharkResourcesNamespace) + if err := kubernetesProvider.RemoveService(ctx, kubesharkResourcesNamespace, kubernetes.ApiServerServiceName); err != nil { + resourceDesc := fmt.Sprintf("Service %s in namespace %s", kubernetes.ApiServerServiceName, kubesharkResourcesNamespace) handleDeletionError(err, resourceDesc, &leftoverResources) } diff --git a/resources/createResources.go b/resources/createResources.go index 92d061499..956823707 100644 --- a/resources/createResources.go +++ b/resources/createResources.go @@ -76,17 +76,19 @@ func CreateTapKubesharkResources(ctx context.Context, kubernetesProvider *kubern return kubesharkServiceAccountExists, err } - _, err = kubernetesProvider.CreateService(ctx, kubesharkResourcesNamespace, kubernetes.ApiServerPodName, kubernetes.ApiServerPodName, 80, int32(config.Config.Hub.PortForward.DstPort), int32(config.Config.Hub.PortForward.SrcPort)) + _, err = kubernetesProvider.CreateService(ctx, kubesharkResourcesNamespace, kubernetes.ApiServerServiceName, kubernetes.ApiServerServiceName, 80, int32(config.Config.Hub.PortForward.DstPort), int32(config.Config.Hub.PortForward.SrcPort)) if err != nil { return kubesharkServiceAccountExists, err } - _, err = kubernetesProvider.CreateService(ctx, kubesharkResourcesNamespace, kubernetes.FrontPodName, kubernetes.FrontPodName, 80, int32(config.Config.Front.PortForward.DstPort), int32(config.Config.Front.PortForward.SrcPort)) + log.Printf("Successfully created service: %s", kubernetes.ApiServerServiceName) + + _, err = kubernetesProvider.CreateService(ctx, kubesharkResourcesNamespace, kubernetes.FrontServiceName, kubernetes.FrontServiceName, 80, int32(config.Config.Front.PortForward.DstPort), int32(config.Config.Front.PortForward.SrcPort)) if err != nil { return kubesharkServiceAccountExists, err } - log.Printf("Successfully created service: %s", kubernetes.ApiServerPodName) + log.Printf("Successfully created service: %s", kubernetes.FrontServiceName) return kubesharkServiceAccountExists, nil }