feat(chart): set components host & port point to its service

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
SeleniumHQ · Feb 6, 2024 · ff668d1 · ff668d1
1 parent 128831a
commit ff668d1
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 8 deletions.
diff --git a/charts/selenium-grid/templates/distributor-deployment.yaml b/charts/selenium-grid/templates/distributor-deployment.yaml
@@ -33,12 +33,16 @@ spec:
           image: {{ printf "%s/%s:%s" $imageRegistry .Values.components.distributor.imageName $imageTag }}
           imagePullPolicy: {{ .Values.components.distributor.imagePullPolicy }}
           env:
+            - name: SE_DISTRIBUTOR_HOST
+              value: '{{ template "seleniumGrid.distributor.fullname" . }}.{{ .Release.Namespace }}'
+            - name: SE_DISTRIBUTOR_PORT
+              value: {{ .Values.components.distributor.port | quote }}
             - name: SE_SESSIONS_MAP_HOST
-              value: {{ template "seleniumGrid.sessionMap.fullname" . }}
+              value: '{{ template "seleniumGrid.sessionMap.fullname" . }}.{{ .Release.Namespace }}'
             - name: SE_SESSIONS_MAP_PORT
               value: {{ .Values.components.sessionMap.port | quote }}
             - name: SE_SESSION_QUEUE_HOST
-              value: {{ template "seleniumGrid.sessionQueue.fullname" . }}
+              value: '{{ template "seleniumGrid.sessionQueue.fullname" . }}.{{ .Release.Namespace }}'
             - name: SE_SESSION_QUEUE_PORT
               value: {{ .Values.components.sessionQueue.port | quote }}
           {{- with .Values.components.extraEnvironmentVariables }}

diff --git a/charts/selenium-grid/templates/event-bus-deployment.yaml b/charts/selenium-grid/templates/event-bus-deployment.yaml
@@ -39,8 +39,13 @@ spec:
               protocol: TCP
             - containerPort: {{ .Values.components.eventBus.subscribePort }}
               protocol: TCP
+          env:
+            - name: SE_EVENT_BUS_HOST
+              value: '{{ template "seleniumGrid.eventBus.fullname" . }}.{{ .Release.Namespace }}'
+            - name: SE_EVENT_BUS_PORT
+              value: {{ .Values.components.eventBus.port | quote }}
         {{- with .Values.components.extraEnvironmentVariables }}
-          env: {{- tpl (toYaml .) $ | nindent 12 }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
         {{- end }}
           envFrom:
             - configMapRef:

diff --git a/charts/selenium-grid/templates/hub-deployment.yaml b/charts/selenium-grid/templates/hub-deployment.yaml
@@ -91,6 +91,10 @@ spec:
           {{- end }}
         {{- end }}
           env:
+            - name: SE_HUB_HOST
+              value: '{{ template "seleniumGrid.hub.fullname" . }}.{{ .Release.Namespace }}'
+            - name: SE_HUB_PORT
+              value: {{ .Values.hub.port | quote }}
             {{- with .Values.hub.subPath }}
             - name: SE_SUB_PATH
               value: {{ . | quote }}

diff --git a/charts/selenium-grid/templates/router-deployment.yaml b/charts/selenium-grid/templates/router-deployment.yaml
@@ -33,16 +33,20 @@ spec:
           image: {{ printf "%s/%s:%s" $imageRegistry .Values.components.router.imageName $imageTag }}
           imagePullPolicy: {{ .Values.components.router.imagePullPolicy }}
           env:
+            - name: SE_ROUTER_HOST
+              value: '{{ template "seleniumGrid.router.fullname" . }}.{{ .Release.Namespace }}'
+            - name: SE_ROUTER_PORT
+              value: {{ .Values.components.router.port | quote }}
             - name: SE_DISTRIBUTOR_HOST
-              value: {{ template "seleniumGrid.distributor.fullname" . }}
+              value: '{{ template "seleniumGrid.distributor.fullname" . }}.{{ .Release.Namespace }}'
             - name: SE_DISTRIBUTOR_PORT
               value: {{ .Values.components.distributor.port | quote }}
             - name: SE_SESSIONS_MAP_HOST
-              value: {{ template "seleniumGrid.sessionMap.fullname" . }}
+              value: '{{ template "seleniumGrid.sessionMap.fullname" . }}.{{ .Release.Namespace }}'
             - name: SE_SESSIONS_MAP_PORT
               value: {{ .Values.components.sessionMap.port | quote }}
             - name: SE_SESSION_QUEUE_HOST
-              value: {{ template "seleniumGrid.sessionQueue.fullname" . }}
+              value: '{{ template "seleniumGrid.sessionQueue.fullname" . }}.{{ .Release.Namespace }}'
             - name: SE_SESSION_QUEUE_PORT
               value: {{ .Values.components.sessionQueue.port | quote }}
             {{- with .Values.components.subPath }}

diff --git a/charts/selenium-grid/templates/session-map-deployment.yaml b/charts/selenium-grid/templates/session-map-deployment.yaml
@@ -32,8 +32,13 @@ spec:
           {{- $imageRegistry := default .Values.global.seleniumGrid.imageRegistry .Values.components.sessionMap.imageRegistry }}
           image: {{ printf "%s/%s:%s" $imageRegistry .Values.components.sessionMap.imageName $imageTag }}
           imagePullPolicy: {{ .Values.components.sessionMap.imagePullPolicy }}
+          env:
+            - name: SE_SESSIONS_HOST
+              value: '{{ template "seleniumGrid.sessionMap.fullname" . }}.{{ .Release.Namespace }}'
+            - name: SE_SESSIONS_PORT
+              value: {{ .Values.components.sessionMap.port | quote }}
         {{- with .Values.components.extraEnvironmentVariables }}
-          env: {{- tpl (toYaml .) $ | nindent 12 }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
         {{- end }}
           envFrom:
             - configMapRef:

diff --git a/charts/selenium-grid/templates/session-queuer-deployment.yaml b/charts/selenium-grid/templates/session-queuer-deployment.yaml
@@ -32,8 +32,13 @@ spec:
           {{- $imageRegistry := default .Values.global.seleniumGrid.imageRegistry .Values.components.sessionQueue.imageRegistry }}
           image: {{ printf "%s/%s:%s" $imageRegistry .Values.components.sessionQueue.imageName $imageTag }}
           imagePullPolicy: {{ .Values.components.sessionQueue.imagePullPolicy }}
+          env:
+            - name: SE_SESSION_QUEUE_HOST
+              value: '{{ template "seleniumGrid.sessionQueue.fullname" . }}.{{ .Release.Namespace }}'
+            - name: SE_SESSION_QUEUE_PORT
+              value: {{ .Values.components.sessionQueue.port | quote }}
         {{- with .Values.components.extraEnvironmentVariables }}
-          env: {{- tpl (toYaml .) $ | nindent 12 }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
         {{- end }}
           envFrom:
             - configMapRef:

diff --git a/tests/charts/ci/DeploymentAutoscaling-values.yaml b/tests/charts/ci/DeploymentAutoscaling-values.yaml
@@ -37,6 +37,14 @@ chromeNode:
   extraEnvironmentVariables: &extraEnvironmentVariables
     - name: SE_OPTS
       value: "--enable-managed-downloads true"
+    - name: SE_VNC_NO_PASSWORD
+      value: "true"
+    - name: SE_SCREEN_WIDTH
+      value: "1920"
+    - name: SE_SCREEN_HEIGHT
+      value: "1080"
+    - name: TZ
+      value: "Asia/Saigon"
   readinessProbe:
     enabled: &readinessProbe true
   livenessProbe:

diff --git a/tests/charts/ci/JobAutoscaling-values.yaml b/tests/charts/ci/JobAutoscaling-values.yaml
@@ -16,6 +16,14 @@ chromeNode:
   extraEnvironmentVariables: &extraEnvironmentVariables
     - name: SE_OPTS
       value: "--enable-managed-downloads true"
+    - name: SE_VNC_NO_PASSWORD
+      value: "true"
+    - name: SE_SCREEN_WIDTH
+      value: "1920"
+    - name: SE_SCREEN_HEIGHT
+      value: "1080"
+    - name: TZ
+      value: "Asia/Saigon"
   readinessProbe:
     enabled: &readinessProbe false
   livenessProbe: