From 5e269831e4d40ee1a846a0f1db237faf929ecf42 Mon Sep 17 00:00:00 2001
From: "M. Mert Yildiran" <me@mertyildiran.com>
Date: Thu, 29 Dec 2022 03:38:38 +0300
Subject: [PATCH] :fire: Remove volumes and configmap

---
 cmd/common.go                | 11 -------
 kubernetes/provider.go       | 61 ++----------------------------------
 resources/createResources.go |  4 +--
 3 files changed, 4 insertions(+), 72 deletions(-)

diff --git a/cmd/common.go b/cmd/common.go
index 6ba5361a3..cf6673f8e 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -2,14 +2,12 @@ package cmd
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"path"
 	"regexp"
 	"time"
 
-	"github.com/kubeshark/base/pkg/models"
 	"github.com/kubeshark/kubeshark/config"
 	"github.com/kubeshark/kubeshark/errormessage"
 	"github.com/kubeshark/kubeshark/internal/connect"
@@ -113,12 +111,3 @@ func dumpLogsIfNeeded(ctx context.Context, kubernetesProvider *kubernetes.Provid
 		log.Error().Err(err).Msg("Failed to dump logs.")
 	}
 }
-
-func getSerializedTapConfig(conf *models.Config) (string, error) {
-	serializedConfig, err := json.Marshal(conf)
-	if err != nil {
-		return "", err
-	}
-
-	return string(serializedConfig), nil
-}
diff --git a/kubernetes/provider.go b/kubernetes/provider.go
index 9cd1e3eaa..af50dbffe 100644
--- a/kubernetes/provider.go
+++ b/kubernetes/provider.go
@@ -180,7 +180,7 @@ type PodOptions struct {
 	Debug              bool
 }
 
-func (provider *Provider) BuildHubPod(opts *PodOptions, mountVolumeClaim bool, volumeClaimName string) (*core.Pod, error) {
+func (provider *Provider) BuildHubPod(opts *PodOptions) (*core.Pod, error) {
 	configMapVolume := &core.ConfigMapVolumeSource{}
 	configMapVolume.Name = ConfigMapName
 
@@ -209,42 +209,11 @@ func (provider *Provider) BuildHubPod(opts *PodOptions, mountVolumeClaim bool, v
 		command = append(command, "-debug")
 	}
 
-	volumeMounts := []core.VolumeMount{
-		{
-			Name:      ConfigMapName,
-			MountPath: models.ConfigDirPath,
-		},
-	}
-	volumes := []core.Volume{
-		{
-			Name: ConfigMapName,
-			VolumeSource: core.VolumeSource{
-				ConfigMap: configMapVolume,
-			},
-		},
-	}
-
-	if mountVolumeClaim {
-		volumes = append(volumes, core.Volume{
-			Name: volumeClaimName,
-			VolumeSource: core.VolumeSource{
-				PersistentVolumeClaim: &core.PersistentVolumeClaimVolumeSource{
-					ClaimName: volumeClaimName,
-				},
-			},
-		})
-		volumeMounts = append(volumeMounts, core.VolumeMount{
-			Name:      volumeClaimName,
-			MountPath: models.DataDirPath,
-		})
-	}
-
 	containers := []core.Container{
 		{
 			Name:            opts.PodName,
 			Image:           opts.PodImage,
 			ImagePullPolicy: opts.ImagePullPolicy,
-			VolumeMounts:    volumeMounts,
 			Command:         command,
 			Resources: core.ResourceRequirements{
 				Limits: core.ResourceList{
@@ -270,7 +239,6 @@ func (provider *Provider) BuildHubPod(opts *PodOptions, mountVolumeClaim bool, v
 		},
 		Spec: core.PodSpec{
 			Containers:                    containers,
-			Volumes:                       volumes,
 			DNSPolicy:                     core.DNSClusterFirstWithHostNet,
 			TerminationGracePeriodSeconds: new(int64),
 			Tolerations: []core.Toleration{
@@ -293,7 +261,7 @@ func (provider *Provider) BuildHubPod(opts *PodOptions, mountVolumeClaim bool, v
 	return pod, nil
 }
 
-func (provider *Provider) BuildFrontPod(opts *PodOptions, mountVolumeClaim bool, volumeClaimName string) (*core.Pod, error) {
+func (provider *Provider) BuildFrontPod(opts *PodOptions) (*core.Pod, error) {
 	configMapVolume := &core.ConfigMapVolumeSource{}
 	configMapVolume.Name = ConfigMapName
 
@@ -361,7 +329,6 @@ func (provider *Provider) BuildFrontPod(opts *PodOptions, mountVolumeClaim bool,
 					Value: "8898",
 				},
 			},
-			WorkingDir: models.DataDirPath,
 		},
 	}
 
@@ -690,30 +657,6 @@ func (provider *Provider) handleRemovalError(err error) error {
 	return err
 }
 
-func (provider *Provider) CreateConfigMap(ctx context.Context, namespace string, configMapName string, serializedKubesharkConfig string) error {
-	configMapData := make(map[string]string)
-	configMapData[models.ConfigFileName] = serializedKubesharkConfig
-
-	configMap := &core.ConfigMap{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "ConfigMap",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: configMapName,
-			Labels: map[string]string{
-				LabelManagedBy: provider.managedBy,
-				LabelCreatedBy: provider.createdBy,
-			},
-		},
-		Data: configMapData,
-	}
-	if _, err := provider.clientSet.CoreV1().ConfigMaps(namespace).Create(ctx, configMap, metav1.CreateOptions{}); err != nil {
-		return err
-	}
-	return nil
-}
-
 func (provider *Provider) ApplyWorkerDaemonSet(
 	ctx context.Context,
 	namespace string,
diff --git a/resources/createResources.go b/resources/createResources.go
index 3037bdd9a..002e0dd6f 100644
--- a/resources/createResources.go
+++ b/resources/createResources.go
@@ -98,7 +98,7 @@ func createRBACIfNecessary(ctx context.Context, kubernetesProvider *kubernetes.P
 }
 
 func createKubesharkHubPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, opts *kubernetes.PodOptions) error {
-	pod, err := kubernetesProvider.BuildHubPod(opts, false, "")
+	pod, err := kubernetesProvider.BuildHubPod(opts)
 	if err != nil {
 		return err
 	}
@@ -110,7 +110,7 @@ func createKubesharkHubPod(ctx context.Context, kubernetesProvider *kubernetes.P
 }
 
 func createFrontPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, opts *kubernetes.PodOptions) error {
-	pod, err := kubernetesProvider.BuildFrontPod(opts, false, "")
+	pod, err := kubernetesProvider.BuildFrontPod(opts)
 	if err != nil {
 		return err
 	}