From d99bfea0db57f2430380a14a89510838cb49cdbf Mon Sep 17 00:00:00 2001
From: "M. Mert Yildiran" <me@mertyildiran.com>
Date: Mon, 15 Jan 2024 21:14:06 +0300
Subject: [PATCH] :hammer: Rename `worker` resource requirement to `sniffer`

---
 config/configStructs/tapConfig.go             |  6 ++---
 .../templates/09-worker-daemon-set.yaml       |  8 +++---
 helm-chart/values.yaml                        |  4 +--
 manifests/complete.yaml                       | 27 +++++++++++++++++--
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go
index 2b10c2359..6ed2cd21d 100644
--- a/config/configStructs/tapConfig.go
+++ b/config/configStructs/tapConfig.go
@@ -77,9 +77,9 @@ type DockerConfig struct {
 }
 
 type ResourcesConfig struct {
-	Worker ResourceRequirements `yaml:"worker" json:"worker"`
-	Hub    ResourceRequirements `yaml:"hub" json:"hub"`
-	Tracer ResourceRequirements `yaml:"tracer" json:"tracer"`
+	Hub     ResourceRequirements `yaml:"hub" json:"hub"`
+	Sniffer ResourceRequirements `yaml:"sniffer" json:"sniffer"`
+	Tracer  ResourceRequirements `yaml:"tracer" json:"tracer"`
 }
 
 type AuthConfig struct {
diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml
index 0c9d78e0e..424447753 100644
--- a/helm-chart/templates/09-worker-daemon-set.yaml
+++ b/helm-chart/templates/09-worker-daemon-set.yaml
@@ -80,11 +80,11 @@ spec:
                 fieldPath: metadata.namespace
           resources:
             limits:
-              cpu: {{ .Values.tap.resources.worker.limits.cpu }}
-              memory: {{ .Values.tap.resources.worker.limits.memory }}
+              cpu: {{ .Values.tap.resources.sniffer.limits.cpu }}
+              memory: {{ .Values.tap.resources.sniffer.limits.memory }}
             requests:
-              cpu: {{ .Values.tap.resources.worker.requests.cpu }}
-              memory: {{ .Values.tap.resources.worker.requests.memory }}
+              cpu: {{ .Values.tap.resources.sniffer.requests.cpu }}
+              memory: {{ .Values.tap.resources.sniffer.requests.memory }}
           securityContext:
             capabilities:
               add:
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index ddaa52139..7a2034483 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -25,14 +25,14 @@ tap:
   storageClass: standard
   dryRun: false
   resources:
-    worker:
+    hub:
       limits:
         cpu: 750m
         memory: 1Gi
       requests:
         cpu: 50m
         memory: 50Mi
-    hub:
+    sniffer:
       limits:
         cpu: 750m
         memory: 1Gi
diff --git a/manifests/complete.yaml b/manifests/complete.yaml
index a0636049b..026ed8508 100644
--- a/manifests/complete.yaml
+++ b/manifests/complete.yaml
@@ -249,7 +249,7 @@ spec:
     app.kubeshark.co/app: front
   type: ClusterIP
 ---
-# Source: kubeshark/templates/16-worker-service-metrics.yaml
+# Source: kubeshark/templates/15-worker-service-metrics.yaml
 kind: Service
 apiVersion: v1
 metadata:
@@ -308,6 +308,19 @@ spec:
       name: kubeshark-worker-daemon-set
       namespace: kubeshark
     spec:
+      initContainers:
+      - name: load-pf-ring
+        image: kubeshark/pf-ring-module:all
+        imagePullPolicy: Always
+        securityContext:
+          capabilities:
+            add:
+              - SYS_MODULE
+            drop:
+              - ALL
+        volumeMounts:
+        - name: lib-modules
+          mountPath: /lib/modules
       containers:
         - command:
             - ./worker
@@ -320,6 +333,7 @@ spec:
             - -servicemesh
             - -procfs
             - /hostproc
+            - -kernel-module
           image: 'docker.io/kubeshark/worker:v52.0.0'
           imagePullPolicy: Always
           name: sniffer
@@ -348,7 +362,6 @@ spec:
               add:
                 - NET_RAW
                 - NET_ADMIN
-                - SYS_MODULE
                 - SYS_ADMIN
                 - SYS_PTRACE
                 - DAC_OVERRIDE
@@ -394,6 +407,13 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          resources:
+            limits:
+              cpu: 750m
+              memory: 1Gi
+            requests:
+              cpu: 50m
+              memory: 50Mi
           securityContext:
             capabilities:
               add:
@@ -437,6 +457,9 @@ spec:
         - hostPath:
             path: /sys
           name: sys
+        - name: lib-modules
+          hostPath:
+            path: /lib/modules
         - name: data
           emptyDir:
             sizeLimit: 500Mi