From 1474a7d687a92eff051daa4d970a84320feab264 Mon Sep 17 00:00:00 2001
From: "M. Mert Yildiran" <me@mertyildiran.com>
Date: Thu, 29 Dec 2022 04:23:37 +0300
Subject: [PATCH] :zap: Get Hub host and port from `ProxyConfig` struct

---
 cmd/tapPcapRunner.go         | 5 ++---
 kubernetes/provider.go       | 7 +++----
 resources/createResources.go | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/cmd/tapPcapRunner.go b/cmd/tapPcapRunner.go
index 00a0653ff..022f09018 100644
--- a/cmd/tapPcapRunner.go
+++ b/cmd/tapPcapRunner.go
@@ -150,14 +150,13 @@ func createAndStartContainers(
 		},
 	}
 
-	// TODO: Get host and port from ProxyConfig
 	respFront, err = cli.ContainerCreate(ctx, &container.Config{
 		Image: imageFront,
 		Tty:   false,
 		Env: []string{
 			"REACT_APP_DEFAULT_FILTER= ",
-			"REACT_APP_HUB_HOST=localhost",
-			"REACT_APP_HUB_PORT=8898",
+			fmt.Sprintf("REACT_APP_HUB_HOST=%s", config.Config.Tap.Proxy.Host),
+			fmt.Sprintf("REACT_APP_HUB_PORT=%d", config.Config.Tap.Proxy.Hub.SrcPort),
 		},
 	}, hostConfigFront, nil, nil, nameFront)
 	if err != nil {
diff --git a/kubernetes/provider.go b/kubernetes/provider.go
index e751aa5c4..3acf591e2 100644
--- a/kubernetes/provider.go
+++ b/kubernetes/provider.go
@@ -261,7 +261,7 @@ func (provider *Provider) BuildHubPod(opts *PodOptions) (*core.Pod, error) {
 	return pod, nil
 }
 
-func (provider *Provider) BuildFrontPod(opts *PodOptions) (*core.Pod, error) {
+func (provider *Provider) BuildFrontPod(opts *PodOptions, hubHost string, hubPort string) (*core.Pod, error) {
 	configMapVolume := &core.ConfigMapVolumeSource{}
 	configMapVolume.Name = ConfigMapName
 
@@ -285,7 +285,6 @@ func (provider *Provider) BuildFrontPod(opts *PodOptions) (*core.Pod, error) {
 	volumeMounts := []core.VolumeMount{}
 	volumes := []core.Volume{}
 
-	// TODO: Get host and port from ProxyConfig
 	containers := []core.Container{
 		{
 			Name:            opts.PodName,
@@ -322,11 +321,11 @@ func (provider *Provider) BuildFrontPod(opts *PodOptions) (*core.Pod, error) {
 				},
 				{
 					Name:  "REACT_APP_HUB_HOST",
-					Value: "localhost",
+					Value: hubHost,
 				},
 				{
 					Name:  "REACT_APP_HUB_PORT",
-					Value: "8898",
+					Value: hubPort,
 				},
 			},
 		},
diff --git a/resources/createResources.go b/resources/createResources.go
index 11925e57b..f0c4fc233 100644
--- a/resources/createResources.go
+++ b/resources/createResources.go
@@ -110,7 +110,7 @@ func createSelfHubPod(ctx context.Context, kubernetesProvider *kubernetes.Provid
 }
 
 func createFrontPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, opts *kubernetes.PodOptions) error {
-	pod, err := kubernetesProvider.BuildFrontPod(opts)
+	pod, err := kubernetesProvider.BuildFrontPod(opts, config.Config.Tap.Proxy.Host, fmt.Sprintf("%d", config.Config.Tap.Proxy.Hub.SrcPort))
 	if err != nil {
 		return err
 	}