K8s: Component service name in the same namespace

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

charts/selenium-grid/templates/_helpers.tpl

@@ -707,7 +707,7 @@ Graphql Url for internal monitoring exporter
 {{- end -}}
 
 {{- define "seleniumGrid.url.host" -}}
-{{- $host := printf "%s.%s.svc.cluster.local" (include ($.Values.isolateComponents | ternary "seleniumGrid.router.fullname" "seleniumGrid.hub.fullname") $ ) (.Release.Namespace) -}}
+{{- $host := include ($.Values.isolateComponents | ternary "seleniumGrid.router.fullname" "seleniumGrid.hub.fullname") $ -}}
 {{- if eq (include "seleniumGrid.ingress.enabled" $) "true" -}}
   {{- if and (not .Values.ingress.hostname) .Values.global.K8S_PUBLIC_IP -}}
     {{- $host = .Values.global.K8S_PUBLIC_IP -}}
@@ -721,7 +721,7 @@ Graphql Url for internal monitoring exporter
 {{- end -}}
 
 {{- define "seleniumGrid.server.url.host" -}}
-{{- $host := printf "%s.%s.svc.cluster.local" (include ($.Values.isolateComponents | ternary "seleniumGrid.router.fullname" "seleniumGrid.hub.fullname") $ ) (.Release.Namespace) -}}
+{{- $host := include ($.Values.isolateComponents | ternary "seleniumGrid.router.fullname" "seleniumGrid.hub.fullname") $ -}}
 {{- $host }}
 {{- end -}}
 

charts/selenium-grid/templates/event-bus-configmap.yaml

@@ -1,4 +1,4 @@
-{{- $eventBusHost := printf "%s.%s.svc.cluster.local" (ternary (include "seleniumGrid.eventBus.fullname" .) (include "seleniumGrid.hub.fullname" .) .Values.isolateComponents) (.Release.Namespace) -}}
+{{- $eventBusHost := tpl (default (ternary (include "seleniumGrid.eventBus.fullname" $) (include "seleniumGrid.hub.fullname" $) $.Values.isolateComponents) $.Values.global.seleniumGrid.SE_EVENT_BUS_HOST) $ -}}
 {{- $eventBusPublishPort := ternary .Values.components.eventBus.publishPort .Values.hub.publishPort .Values.isolateComponents -}}
 {{- $eventBusSubscribePort := ternary .Values.components.eventBus.subscribePort .Values.hub.subscribePort .Values.isolateComponents -}}
 apiVersion: v1

charts/selenium-grid/templates/node-configmap.yaml

@@ -1,6 +1,6 @@
-{{- $distributorHost := printf "%s.%s.svc.cluster.local" (include "seleniumGrid.distributor.fullname" .) (.Release.Namespace) -}}
-{{- $routerHost := printf "%s.%s.svc.cluster.local" (include "seleniumGrid.router.fullname" .) (.Release.Namespace) -}}
-{{- $hubHost := printf "%s.%s.svc.cluster.local" (include "seleniumGrid.hub.fullname" .) (.Release.Namespace) -}}
+{{- $distributorHost := tpl (default (include "seleniumGrid.distributor.fullname" $) $.Values.global.seleniumGrid.SE_DISTRIBUTOR_HOST) $ -}}
+{{- $routerHost := tpl (default (include "seleniumGrid.router.fullname" $) $.Values.global.seleniumGrid.SE_ROUTER_HOST) $ -}}
+{{- $hubHost := tpl (default (include "seleniumGrid.hub.fullname" $) $.Values.global.seleniumGrid.SE_HUB_HOST) $ -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/selenium-grid/templates/secrets.yaml

@@ -21,7 +21,7 @@ data:
   {{ $name }}: {{ tpl ($value) $ | b64enc }}
 {{- end }}
 {{- end }}
-  SE_NODE_GRID_URL: {{ include "seleniumGrid.url" $ | b64enc }}
+  SE_NODE_GRID_URL: {{ tpl (default (include "seleniumGrid.url" $) $.Values.global.seleniumGrid.SE_NODE_GRID_URL) $ | b64enc }}
   SE_NODE_GRID_GRAPHQL_URL: {{ include "seleniumGrid.graphqlURL" $ | b64enc }}
 {{- with $.Values.tls.trustStorePassword }}
   SE_JAVA_SSL_TRUST_STORE_PASSWORD: {{ . | b64enc }}

charts/selenium-grid/values.yaml

@@ -50,6 +50,11 @@ global:
     #    Note: If not define labelSelector, it will be added automatically based on "app" label in each component
     # -- Specify number of max sessions per node. Can be overridden by individual component (this is also set to scaler trigger parameter `nodeMaxSessions` if `autoscaling` is enabled)
     nodeMaxSessions: 1
+    SE_EVENT_BUS_HOST: ""
+    SE_DISTRIBUTOR_HOST: ""
+    SE_ROUTER_HOST: ""
+    SE_HUB_HOST: ""
+    SE_NODE_GRID_URL: ""
 
 tls:
   # -- Create a Secret resource for TLS certificate and key. If using an external secret set to false and provide its name in `nameOverride` below

tests/charts/templates/test.py

@@ -80,7 +80,7 @@ def test_graphql_url_for_autoscaling_constructed_without_basic_auth_in_url(self)
                 logger.info(f"Assert graphql url is constructed without basic auth in url")
                 base64_url = doc['data']['SE_NODE_GRID_GRAPHQL_URL']
                 decoded_url = base64.b64decode(base64_url).decode('utf-8')
-                self.assertTrue(decoded_url == f'https://{RELEASE_NAME}selenium-router.default.svc.cluster.local:4444/selenium/graphql', decoded_url)
+                self.assertTrue(decoded_url == f'https://{RELEASE_NAME}selenium-router:4444/selenium/graphql', decoded_url)
 
     def test_distributor_new_session_thread_pool_size(self):
         resources_name = [f'{RELEASE_NAME}selenium-distributor']