diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go index da4dbd55c..75cb8fd11 100644 --- a/config/configStructs/tapConfig.go +++ b/config/configStructs/tapConfig.go @@ -57,8 +57,7 @@ type HubConfig struct { } type FrontConfig struct { - Port uint16 `yaml:"port" json:"port" default:"8899"` - SrvPort uint16 `yaml:"srvport" json:"srvport" default:"8899"` + Port uint16 `yaml:"port" json:"port" default:"8899"` } type ProxyConfig struct { diff --git a/helm-chart/templates/04-hub-pod.yaml b/helm-chart/templates/04-hub-pod.yaml index 8297067f5..a98cd5329 100644 --- a/helm-chart/templates/04-hub-pod.yaml +++ b/helm-chart/templates/04-hub-pod.yaml @@ -19,6 +19,8 @@ spec: - command: - ./hub {{ .Values.tap.debug | ternary "- -debug" "" }} + - -port + - '{{ .Values.tap.proxy.hub.srvport }}' env: - name: POD_REGEX value: '{{ .Values.tap.regex }}' diff --git a/helm-chart/templates/06-front-pod.yaml b/helm-chart/templates/06-front-pod.yaml index 256da7a36..46ec1c0bd 100644 --- a/helm-chart/templates/06-front-pod.yaml +++ b/helm-chart/templates/06-front-pod.yaml @@ -22,7 +22,7 @@ spec: - name: REACT_APP_HUB_HOST value: ' ' - name: REACT_APP_HUB_PORT - value: '{{ .Values.tap.ingress.enabled | ternary "/api" ":8898" }}' + value: '{{ .Values.tap.ingress.enabled | ternary "/api" (print ":" .Values.tap.proxy.hub.port) }}' image: '{{ .Values.tap.docker.registry }}/front:{{ .Values.tap.docker.tag }}' imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }} name: kubeshark-front diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index dd2e8e7d0..d6b2dfa03 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -12,7 +12,6 @@ tap: srvport: 8898 front: port: 8899 - srvport: 8899 host: 127.0.0.1 regex: .* namespaces: []