✨ Add persistentstorage option

config/configStructs/tapConfig.go

@@ -82,6 +82,7 @@ type TapConfig struct {
 	PodRegexStr       string                `yaml:"regex" default:".*"`
 	Namespaces        []string              `yaml:"namespaces"`
 	SelfNamespace     string                `yaml:"selfnamespace" default:"kubeshark"`
+	PersistentStorage bool                  `yaml:"persistentstorage" default:"false"`
 	StorageLimit      string                `yaml:"storagelimit" default:"200Mi"`
 	StorageClass      string                `yaml:"storageclass" default:"standard"`
 	DryRun            bool                  `yaml:"dryrun" default:"false"`

helm-chart/templates/09-worker-daemon-set.yaml

@@ -67,8 +67,6 @@ spec:
             - mountPath: /sys
               name: sys
               readOnly: true
-            - mountPath: /app/data
-              name: kubeshark-persistent-volume
       dnsPolicy: ClusterFirstWithHostNet
       hostNetwork: true
       serviceAccountName: kubeshark-service-account
@@ -85,6 +83,3 @@ spec:
         - hostPath:
             path: /sys
           name: sys
-        - name: kubeshark-persistent-volume
-          persistentVolumeClaim:
-            claimName: kubeshark-persistent-volume-claim

helm-chart/values.yaml

@@ -18,6 +18,7 @@ tap:
   regex: .*
   namespaces: []
   selfnamespace: kubeshark
+  persistentstorage: false
   storagelimit: 200Mi
   storageclass: standard
   dryrun: false

kubernetes/provider.go

@@ -855,18 +855,23 @@ func (provider *Provider) BuildWorkerDaemonSet(
 		MountPath: PersistentVolumeHostPath,
 	}
 
+	// VolumeMount(s)
+	volumeMounts := []core.VolumeMount{
+		procfsVolumeMount,
+		sysfsVolumeMount,
+	}
+	if config.Config.Tap.PersistentStorage {
+		volumeMounts = append(volumeMounts, persistentVolumeMount)
+	}
+
 	// Containers
 	containers := []core.Container{
 		{
 			Name:            podName,
 			Image:           podImage,
 			ImagePullPolicy: imagePullPolicy,
-			VolumeMounts: []core.VolumeMount{
+			VolumeMounts:    volumeMounts,
-				procfsVolumeMount,
+			Command:         command,
-				sysfsVolumeMount,
-				persistentVolumeMount,
-			},
-			Command: command,
 			Resources: core.ResourceRequirements{
 				Limits: core.ResourceList{
 					"cpu":    cpuLimit,
@@ -887,6 +892,15 @@ func (provider *Provider) BuildWorkerDaemonSet(
 		},
 	}
 
+	// Volume(s)
+	volumes := []core.Volume{
+		procfsVolume,
+		sysfsVolume,
+	}
+	if config.Config.Tap.PersistentStorage {
+		volumes = append(volumes, persistentVolume)
+	}
+
 	// Pod
 	pod := DaemonSetPod{
 		ObjectMeta: metav1.ObjectMeta{
@@ -897,14 +911,10 @@ func (provider *Provider) BuildWorkerDaemonSet(
 			}, provider),
 		},
 		Spec: core.PodSpec{
-			ServiceAccountName: ServiceAccountName,
+			ServiceAccountName:            ServiceAccountName,
-			HostNetwork:        true,
+			HostNetwork:                   true,
-			Containers:         containers,
+			Containers:                    containers,
-			Volumes: []core.Volume{
+			Volumes:                       volumes,
-				procfsVolume,
-				sysfsVolume,
-				persistentVolume,
-			},
 			DNSPolicy:                     core.DNSClusterFirstWithHostNet,
 			TerminationGracePeriodSeconds: new(int64),
 			Tolerations:                   provider.BuildTolerations(),

kubernetes/workers.go

@@ -3,6 +3,7 @@ package kubernetes
 import (
 	"context"
 
+	"github.com/kubeshark/kubeshark/config"
 	"github.com/kubeshark/kubeshark/config/configStructs"
 	"github.com/kubeshark/kubeshark/docker"
 	"github.com/rs/zerolog/log"
@@ -21,17 +22,19 @@ func CreateWorkers(
 	tls bool,
 	debug bool,
 ) error {
-	persistentVolumeClaim, err := kubernetesProvider.BuildPersistentVolumeClaim()
+	if config.Config.Tap.PersistentStorage {
-	if err != nil {
+		persistentVolumeClaim, err := kubernetesProvider.BuildPersistentVolumeClaim()
-		return err
+		if err != nil {
-	}
+			return err
+		}
 
-	if _, err = kubernetesProvider.CreatePersistentVolumeClaim(
+		if _, err = kubernetesProvider.CreatePersistentVolumeClaim(
-		ctx,
+			ctx,
-		namespace,
+			namespace,
-		persistentVolumeClaim,
+			persistentVolumeClaim,
-	); err != nil {
+		); err != nil {
-		return err
+			return err
+		}
 	}
 
 	image := docker.GetWorkerImage()

manifests/09-worker-daemon-set.yaml

@@ -67,8 +67,6 @@ spec:
             - mountPath: /sys
               name: sys
               readOnly: true
-            - mountPath: /app/data
-              name: kubeshark-persistent-volume
       dnsPolicy: ClusterFirstWithHostNet
       hostNetwork: true
       serviceAccountName: kubeshark-service-account
@@ -85,6 +83,3 @@ spec:
         - hostPath:
             path: /sys
           name: sys
-        - name: kubeshark-persistent-volume
-          persistentVolumeClaim:
-            claimName: kubeshark-persistent-volume-claim