From 4831b44dfa372be31469d879c4c7abffec23d733 Mon Sep 17 00:00:00 2001
From: "M. Mert Yildiran" <me@mertyildiran.com>
Date: Wed, 4 Oct 2023 06:02:19 +0300
Subject: [PATCH] Revert ":hammer: Separate the resources of each container in
 worker `DaemonSet`"

This reverts commit 6add6fb1ec33e95dbf46c2662dea98cd421f9fed.
---
 config/configStructs/tapConfig.go             | 10 ++++----
 .../templates/09-worker-daemon-set.yaml       | 24 +++++++++----------
 helm-chart/values.yaml                        | 24 ++++---------------
 3 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go
index 2c7ac737d..116e80c77 100644
--- a/config/configStructs/tapConfig.go
+++ b/config/configStructs/tapConfig.go
@@ -34,8 +34,8 @@ const (
 )
 
 type ResourceLimits struct {
-	CPU    string `yaml:"cpu" json:"cpu" default:"500m"`
-	Memory string `yaml:"memory" json:"memory" default:"500Mi"`
+	CPU    string `yaml:"cpu" json:"cpu" default:"750m"`
+	Memory string `yaml:"memory" json:"memory" default:"1Gi"`
 }
 
 type ResourceRequests struct {
@@ -76,10 +76,8 @@ type DockerConfig struct {
 }
 
 type ResourcesConfig struct {
-	Sniffer ResourceRequirements `yaml:"sniffer" json:"sniffer"`
-	Server  ResourceRequirements `yaml:"server" json:"server"`
-	Tracer  ResourceRequirements `yaml:"tracer" json:"tracer"`
-	Hub     ResourceRequirements `yaml:"hub" json:"hub"`
+	Worker ResourceRequirements `yaml:"worker" json:"worker"`
+	Hub    ResourceRequirements `yaml:"hub" json:"hub"`
 }
 
 type AuthConfig struct {
diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml
index 65415cd2d..455a17b57 100644
--- a/helm-chart/templates/09-worker-daemon-set.yaml
+++ b/helm-chart/templates/09-worker-daemon-set.yaml
@@ -60,11 +60,11 @@ spec:
         {{- end }}
           resources:
             limits:
-              cpu: {{ .Values.tap.resources.sniffer.limits.cpu }}
-              memory: {{ .Values.tap.resources.sniffer.limits.memory }}
+              cpu: {{ .Values.tap.resources.worker.limits.cpu }}
+              memory: {{ .Values.tap.resources.worker.limits.memory }}
             requests:
-              cpu: {{ .Values.tap.resources.sniffer.requests.cpu }}
-              memory: {{ .Values.tap.resources.sniffer.requests.memory }}
+              cpu: {{ .Values.tap.resources.worker.requests.cpu }}
+              memory: {{ .Values.tap.resources.worker.requests.memory }}
           securityContext:
             capabilities:
               add:
@@ -117,11 +117,11 @@ spec:
         {{- end }}
           resources:
             limits:
-              cpu: {{ .Values.tap.resources.server.limits.cpu }}
-              memory: {{ .Values.tap.resources.server.limits.memory }}
+              cpu: {{ .Values.tap.resources.worker.limits.cpu }}
+              memory: {{ .Values.tap.resources.worker.limits.memory }}
             requests:
-              cpu: {{ .Values.tap.resources.server.requests.cpu }}
-              memory: {{ .Values.tap.resources.server.requests.memory }}
+              cpu: {{ .Values.tap.resources.worker.requests.cpu }}
+              memory: {{ .Values.tap.resources.worker.requests.memory }}
           securityContext:
             capabilities:
               drop:
@@ -172,11 +172,11 @@ spec:
                 name: kubeshark-secret
           resources:
             limits:
-              cpu: {{ .Values.tap.resources.tracer.limits.cpu }}
-              memory: {{ .Values.tap.resources.tracer.limits.memory }}
+              cpu: {{ .Values.tap.resources.worker.limits.cpu }}
+              memory: {{ .Values.tap.resources.worker.limits.memory }}
             requests:
-              cpu: {{ .Values.tap.resources.tracer.requests.cpu }}
-              memory: {{ .Values.tap.resources.tracer.requests.memory }}
+              cpu: {{ .Values.tap.resources.worker.requests.cpu }}
+              memory: {{ .Values.tap.resources.worker.requests.memory }}
           securityContext:
             capabilities:
               add:
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index dfc7b3e68..2deb8ef7b 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -25,31 +25,17 @@ tap:
   dryrun: false
   pcap: ""
   resources:
-    sniffer:
+    worker:
       limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 50m
-        memory: 50Mi
-    server:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 50m
-        memory: 50Mi
-    tracer:
-      limits:
-        cpu: 500m
-        memory: 500Mi
+        cpu: 750m
+        memory: 1Gi
       requests:
         cpu: 50m
         memory: 50Mi
     hub:
       limits:
-        cpu: 500m
-        memory: 500Mi
+        cpu: 750m
+        memory: 1Gi
       requests:
         cpu: 50m
         memory: 50Mi