⚡ Template hostPort(s) in the Helm chart

cmd/helmChart.go

@@ -259,6 +259,30 @@ func template(object interface{}, mappings map[string]interface{}) (template int
 	return
 }
 
+func handleHubPod(manifest string) string {
+	lines := strings.Split(manifest, "\n")
+
+	for i, line := range lines {
+		if strings.HasPrefix(strings.TrimSpace(line), "hostPort:") {
+			lines[i] = "          hostPort: {{ .Values.tap.proxy.hub.srvport }}"
+		}
+	}
+
+	return strings.Join(lines, "\n")
+}
+
+func handleFrontPod(manifest string) string {
+	lines := strings.Split(manifest, "\n")
+
+	for i, line := range lines {
+		if strings.HasPrefix(strings.TrimSpace(line), "hostPort:") {
+			lines[i] = "          hostPort: {{ .Values.tap.proxy.front.srvport }}"
+		}
+	}
+
+	return strings.Join(lines, "\n")
+}
+
 func handlePVCManifest(manifest string) string {
 	return fmt.Sprintf("{{- if .Values.tap.persistentstorage }}\n%s{{- end }}\n", manifest)
 }
@@ -282,6 +306,14 @@ func handleDaemonSetManifest(manifest string) string {
 		if strings.TrimSpace(line) == "claimName: kubeshark-persistent-volume-claim" {
 			lines[i] = fmt.Sprintf("%s\n{{- end }}", line)
 		}
+
+		if strings.HasPrefix(strings.TrimSpace(line), "- containerPort:") {
+			lines[i] = "            - containerPort: {{ .Values.tap.proxy.worker.srvport }}"
+		}
+
+		if strings.HasPrefix(strings.TrimSpace(line), "hostPort:") {
+			lines[i] = "              hostPort: {{ .Values.tap.proxy.worker.srvport }}"
+		}
 	}
 
 	return strings.Join(lines, "\n")
@@ -315,6 +347,14 @@ func dumpHelmChart(objects map[string]interface{}) error {
 			return err
 		}
 
+		if filename == "04-hub-pod.yaml" {
+			manifest = handleHubPod(manifest)
+		}
+
+		if filename == "06-front-pod.yaml" {
+			manifest = handleFrontPod(manifest)
+		}
+
 		if filename == "08-persistent-volume-claim.yaml" {
 			manifest = handlePVCManifest(manifest)
 		}

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

@@ -30,7 +30,7 @@ spec:
       name: kubeshark-hub
       ports:
         - containerPort: 80
-          hostPort: 8898
+          hostPort: {{ .Values.tap.proxy.hub.srvport }}
       resources:
         limits:
           cpu: '{{ .Values.tap.resources.hub.limits.cpu }}'

helm-chart/templates/06-front-pod.yaml

@@ -24,7 +24,7 @@ spec:
       name: kubeshark-front
       ports:
         - containerPort: 80
-          hostPort: 8899
+          hostPort: {{ .Values.tap.proxy.front.srvport }}
       readinessProbe:
         failureThreshold: 3
         periodSeconds: 1

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

@@ -43,8 +43,8 @@ spec:
           imagePullPolicy: '{{ .Values.tap.docker.imagepullpolicy }}'
           name: kubeshark-worker-daemon-set
           ports:
-            - containerPort: 80
-              hostPort: 8897
+            - containerPort: {{ .Values.tap.proxy.worker.srvport }}
+              hostPort: {{ .Values.tap.proxy.worker.srvport }}
           resources:
             limits:
               cpu: '{{ .Values.tap.resources.worker.limits.cpu }}'

kubernetes/provider.go

@@ -879,7 +879,7 @@ func (provider *Provider) BuildWorkerDaemonSet(
 			Image: podImage,
 			Ports: []core.ContainerPort{{
 				HostPort:      int32(config.Config.Tap.Proxy.Worker.SrvPort),
-				ContainerPort: configStructs.ContainerPort,
+				ContainerPort: int32(config.Config.Tap.Proxy.Worker.SrvPort),
 			}},
 			ImagePullPolicy: imagePullPolicy,
 			VolumeMounts:    volumeMounts,

manifests/09-worker-daemon-set.yaml

@@ -43,7 +43,7 @@ spec:
           imagePullPolicy: Always
           name: kubeshark-worker-daemon-set
           ports:
-            - containerPort: 80
+            - containerPort: 8897
               hostPort: 8897
           resources:
             limits: