Use dissection image tag from worker (#1850)

cmd/tap.go

@@ -62,5 +62,4 @@ func init() {
 	tapCmd.Flags().Bool(configStructs.TelemetryEnabledLabel, defaultTapConfig.Telemetry.Enabled, "Enable/disable Telemetry")
 	tapCmd.Flags().Bool(configStructs.ResourceGuardEnabledLabel, defaultTapConfig.ResourceGuard.Enabled, "Enable/disable resource guard")
 	tapCmd.Flags().Bool(configStructs.WatchdogEnabled, defaultTapConfig.Watchdog.Enabled, "Enable/disable watchdog")
-	tapCmd.Flags().String(configStructs.HelmChartPathLabel, defaultTapConfig.Release.HelmChartPath, "Path to a local Helm chart folder (overrides the remote Helm repo)")
 }

config/configStructs/tapConfig.go

@@ -45,7 +45,6 @@ const (
 	PcapDumpEnabled              = "enabled"
 	PcapTime                     = "time"
 	WatchdogEnabled              = "watchdogEnabled"
-	HelmChartPathLabel           = "release-helmChartPath"
 )
 
 type ResourceLimitsHub struct {
@@ -212,7 +211,6 @@ type ReleaseConfig struct {
 	Repo      string `yaml:"repo" json:"repo" default:"https://helm.kubeshark.com"`
 	Name      string `yaml:"name" json:"name" default:"kubeshark"`
 	Namespace string `yaml:"namespace" json:"namespace" default:"default"`
-	HelmChartPath string `yaml:"helmChartPath" json:"helmChartPath" default:""`
 }
 
 type TelemetryConfig struct {
@@ -316,7 +314,6 @@ type SnapshotsConfig struct {
 }
 
 type DelayedDissectionConfig struct {
-	Image  string `yaml:"image" json:"image" default:"kubeshark/worker:master"`
 	CPU    string `yaml:"cpu" json:"cpu" default:"1"`
 	Memory string `yaml:"memory" json:"memory" default:"4Gi"`
 }

helm-chart/templates/04-hub-deployment.yaml

@@ -40,10 +40,14 @@ spec:
             - "{{ if hasKey .Values.tap.capture.dissection "stopAfter" }}{{ .Values.tap.capture.dissection.stopAfter }}{{ else }}5m{{ end }}"
             - -snapshot-size-limit
             - '{{ .Values.tap.snapshots.storageSize }}'
-            {{- if .Values.tap.delayedDissection.image }}
             - -dissector-image
-            - '{{ .Values.tap.delayedDissection.image }}'
+          {{- if .Values.tap.docker.overrideImage.worker }}
-            {{- end }}
+            - '{{ .Values.tap.docker.overrideImage.worker }}'
+          {{- else if .Values.tap.docker.overrideTag.worker }}
+            - '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.overrideTag.worker }}'
+          {{- else }}
+            - '{{ .Values.tap.docker.registry }}/worker:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (include "kubeshark.defaultVersion" .) }}'
+          {{- end }}
             {{- if .Values.tap.delayedDissection.cpu }}
             - -dissector-cpu
             - '{{ .Values.tap.delayedDissection.cpu }}'

helm-chart/values.yaml

@@ -35,7 +35,6 @@ tap:
       storageSize: 1Gi
     dbMaxSize: 500Mi
   delayedDissection:
-    image: kubeshark/worker:master
     cpu: "1"
     memory: 4Gi
   snapshots:

kubernetes/helm/helm.go

@@ -67,10 +67,7 @@ func (h *Helm) Install() (rel *release.Release, err error) {
 	client.Namespace = h.releaseNamespace
 	client.ReleaseName = h.releaseName
 
-	chartPath := config.Config.Tap.Release.HelmChartPath
+	chartPath := os.Getenv(fmt.Sprintf("%s_HELM_CHART_PATH", strings.ToUpper(misc.Program)))
-	if chartPath == "" {
-		chartPath = os.Getenv(fmt.Sprintf("%s_HELM_CHART_PATH", strings.ToUpper(misc.Program)))
-	}
 	if chartPath == "" {
 		var chartURL string
 		chartURL, err = repo.FindChartInRepoURL(h.repo, h.releaseName, "", "", "", "", getter.All(&cli.EnvSettings{}))

manifests/complete.yaml

@@ -209,10 +209,8 @@ data:
         proxy_set_header  Authorization $http_authorization;
         proxy_pass_header Authorization;
         proxy_connect_timeout 4s;
-        # Disable buffering for gRPC/Connect streaming
+        proxy_read_timeout 120s;
-        client_max_body_size 0;
+        proxy_send_timeout 12s;
-        proxy_request_buffering off;
-        proxy_buffering off;
         proxy_pass_request_headers      on;
       }