From 5973a77cf890c46aab65a6a942ffd9383cdc6052 Mon Sep 17 00:00:00 2001
From: "M. Mert Yildiran" <me@mertyildiran.com>
Date: Sun, 11 Dec 2022 11:52:33 +0300
Subject: [PATCH] :fire: Remove `--hub-ws-address` flag and `max-live-streams`
 option

---
 cmd/deploy.go                        | 1 -
 cmd/deployRunner.go                  | 1 -
 config/configStructs/deployConfig.go | 2 --
 kubernetes/kubesharkTapperSyncer.go  | 5 +----
 kubernetes/provider.go               | 6 +-----
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/cmd/deploy.go b/cmd/deploy.go
index ee08fce7b..bc6349b33 100644
--- a/cmd/deploy.go
+++ b/cmd/deploy.go
@@ -57,5 +57,4 @@ func init() {
 	deployCmd.Flags().Bool(configStructs.ServiceMeshName, defaultDeployConfig.ServiceMesh, "Record decrypted traffic if the cluster is configured with a service mesh and with mtls.")
 	deployCmd.Flags().Bool(configStructs.TlsName, defaultDeployConfig.Tls, "Record tls traffic.")
 	deployCmd.Flags().Bool(configStructs.ProfilerName, defaultDeployConfig.Profiler, "Run pprof server.")
-	deployCmd.Flags().Int(configStructs.MaxLiveStreamsName, defaultDeployConfig.MaxLiveStreams, "Maximum live tcp streams to handle concurrently.")
 }
diff --git a/cmd/deployRunner.go b/cmd/deployRunner.go
index 901ddf4f6..6b46b4a7c 100644
--- a/cmd/deployRunner.go
+++ b/cmd/deployRunner.go
@@ -153,7 +153,6 @@ func startWorkerSyncer(ctx context.Context, cancel context.CancelFunc, provider
 		KubesharkServiceAccountExists: state.kubesharkServiceAccountExists,
 		ServiceMesh:                   config.Config.Deploy.ServiceMesh,
 		Tls:                           config.Config.Deploy.Tls,
-		MaxLiveStreams:                config.Config.Deploy.MaxLiveStreams,
 	}, startTime)
 
 	if err != nil {
diff --git a/config/configStructs/deployConfig.go b/config/configStructs/deployConfig.go
index a9320513f..522b14599 100644
--- a/config/configStructs/deployConfig.go
+++ b/config/configStructs/deployConfig.go
@@ -24,7 +24,6 @@ const (
 	ServiceMeshName            = "service-mesh"
 	TlsName                    = "tls"
 	ProfilerName               = "profiler"
-	MaxLiveStreamsName         = "max-live-streams"
 )
 
 type DeployConfig struct {
@@ -52,7 +51,6 @@ type DeployConfig struct {
 	Tls                   bool             `yaml:"tls" default:"false"`
 	PacketCapture         string           `yaml:"packet-capture" default:"libpcap"`
 	Profiler              bool             `yaml:"profiler" default:"false"`
-	MaxLiveStreams        int              `yaml:"max-live-streams" default:"500"`
 }
 
 func (config *DeployConfig) PodRegex() *regexp.Regexp {
diff --git a/kubernetes/kubesharkTapperSyncer.go b/kubernetes/kubesharkTapperSyncer.go
index f6da860aa..f0887bd30 100644
--- a/kubernetes/kubesharkTapperSyncer.go
+++ b/kubernetes/kubesharkTapperSyncer.go
@@ -48,7 +48,6 @@ type WorkerSyncerConfig struct {
 	KubesharkServiceAccountExists bool
 	ServiceMesh                   bool
 	Tls                           bool
-	MaxLiveStreams                int
 }
 
 func CreateAndStartWorkerSyncer(ctx context.Context, kubernetesProvider *Provider, config WorkerSyncerConfig, startTime time.Time) (*WorkerSyncer, error) {
@@ -371,7 +370,6 @@ func (workerSyncer *WorkerSyncer) updateWorkers() error {
 			WorkerDaemonSetName,
 			image,
 			WorkerPodName,
-			fmt.Sprintf("%s.%s.svc", HubPodName, workerSyncer.config.KubesharkResourcesNamespace),
 			nodeNames,
 			serviceAccountName,
 			workerSyncer.config.WorkerResources,
@@ -379,8 +377,7 @@ func (workerSyncer *WorkerSyncer) updateWorkers() error {
 			workerSyncer.config.KubesharkApiFilteringOptions,
 			workerSyncer.config.LogLevel,
 			workerSyncer.config.ServiceMesh,
-			workerSyncer.config.Tls,
-			workerSyncer.config.MaxLiveStreams); err != nil {
+			workerSyncer.config.Tls); err != nil {
 			return err
 		}
 
diff --git a/kubernetes/provider.go b/kubernetes/provider.go
index 407a3252a..74c048f45 100644
--- a/kubernetes/provider.go
+++ b/kubernetes/provider.go
@@ -10,7 +10,6 @@ import (
 	"net/url"
 	"path/filepath"
 	"regexp"
-	"strconv"
 
 	"github.com/kubeshark/base/pkg/api"
 	"github.com/kubeshark/base/pkg/models"
@@ -781,7 +780,7 @@ func (provider *Provider) CreateConfigMap(ctx context.Context, namespace string,
 	return nil
 }
 
-func (provider *Provider) ApplyWorkerDaemonSet(ctx context.Context, namespace string, daemonSetName string, podImage string, workerPodName string, hubPodIp string, nodeNames []string, serviceAccountName string, resources models.Resources, imagePullPolicy core.PullPolicy, kubesharkApiFilteringOptions api.TrafficFilteringOptions, logLevel zerolog.Level, serviceMesh bool, tls bool, maxLiveStreams int) error {
+func (provider *Provider) ApplyWorkerDaemonSet(ctx context.Context, namespace string, daemonSetName string, podImage string, workerPodName string, nodeNames []string, serviceAccountName string, resources models.Resources, imagePullPolicy core.PullPolicy, kubesharkApiFilteringOptions api.TrafficFilteringOptions, logLevel zerolog.Level, serviceMesh bool, tls bool) error {
 	log.Debug().
 		Int("node-count", len(nodeNames)).
 		Str("namespace", namespace).
@@ -802,9 +801,6 @@ func (provider *Provider) ApplyWorkerDaemonSet(ctx context.Context, namespace st
 	kubesharkCmd := []string{
 		"./worker",
 		"-i", "any",
-		"--hub-ws-address", fmt.Sprintf("ws://%s/wsWorker", hubPodIp),
-		"--nodefrag",
-		"--max-live-streams", strconv.Itoa(maxLiveStreams),
 	}
 
 	if serviceMesh {