github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-20 09:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update public_routes.go, tapRunner.go, and proxy.go

Browse Source
This commit is contained in:
RamiBerm
2021-07-11 14:01:07 +03:00
parent 65ba0952b4
commit 3db6d5a5ea
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/pkg/routes/public_routes.go
View File

@@ -21,5 +21,4 @@ func EntriesRoutes(fiberApp *fiber.App) {
routeGroup.Get("/tapStatus", controllers.GetTappingStatus) // get tapping status routeGroup.Get("/tapStatus", controllers.GetTappingStatus) // get tapping status
routeGroup.Get("/analyzeStatus", controllers.AnalyzeInformation) routeGroup.Get("/analyzeStatus", controllers.AnalyzeInformation)
} }

14
cli/cmd/tapRunner.go
View File

@@ -3,6 +3,7 @@ package cmd
import ( import (
"context" "context"
"fmt" "fmt"
"net/http"
"os" "os"
"os/signal" "os/signal"
"regexp" "regexp"
@@ -74,7 +75,6 @@ func RunMizuTap(podRegexQuery *regexp.Regexp, tappingOptions *MizuTapOptions) {
go portForwardApiPod(ctx, kubernetesProvider, cancel, tappingOptions) // TODO convert this to job for built in pod ttl or have the running app handle this go portForwardApiPod(ctx, kubernetesProvider, cancel, tappingOptions) // TODO convert this to job for built in pod ttl or have the running app handle this
go watchPodsForTapping(ctx, kubernetesProvider, cancel, podRegexQuery, tappingOptions) go watchPodsForTapping(ctx, kubernetesProvider, cancel, podRegexQuery, tappingOptions)
go syncApiStatus(ctx, cancel, tappingOptions) go syncApiStatus(ctx, cancel, tappingOptions)
//go spamHealthcheck(ctx, tappingOptions)
//block until exit signal or error //block until exit signal or error
waitForFinish(ctx, cancel) waitForFinish(ctx, cancel)
@@ -248,8 +248,18 @@ func portForwardApiPod(ctx context.Context, kubernetesProvider *kubernetes.Provi
cancel() cancel()
} }
}() }()
fmt.Printf("Mizu is available at http://%s\n", kubernetes.GetMizuCollectorProxiesHostAndPath(tappingOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName)) mizuProxiedUrl := kubernetes.GetMizuCollectorProxiesHostAndPath(tappingOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName)
fmt.Printf("Mizu is available at http://%s\n", mizuProxiedUrl)
time.Sleep(time.Second * 5) // Waiting to be sure the proxy is ready
if tappingOptions.Analyze {
if _, err := http.Get(fmt.Sprintf("http://%s/api/uploadEntries?dest=%s", mizuProxiedUrl, tappingOptions.AnalyzeDestination)); err != nil {
fmt.Println(err)
} else {
fmt.Printf(mizu.Purple, "Traffic is uploading to UP9 cloud for further analsys")
fmt.Println()
}
}
isPodReady = true isPodReady = true
} }

3
cli/kubernetes/proxy.go
View File

@@ -28,8 +28,7 @@ func StartProxy(kubernetesProvider *Provider, mizuPort uint16, mizuNamespace str
mux.Handle(k8sProxyApiPrefix, proxyHandler) mux.Handle(k8sProxyApiPrefix, proxyHandler)
//work around to make static resources available to the dashboard (all .svgs will not load without this) //work around to make static resources available to the dashboard (all .svgs will not load without this)
mux.Handle("/static/", getRerouteHttpHandler(proxyHandler, mizuProxiedUrl)) mux.Handle("/static/", getRerouteHttpHandler(proxyHandler, mizuProxiedUrl))
//l, err := server.Listen("127.0.0.1", int(mizuPort))
l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "127.0.0.1", int(mizuPort))) l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "127.0.0.1", int(mizuPort)))
if err != nil { if err != nil {
return err return err