K8s: Update config components.subPath to components.router.subPath

Since `subPath` is a config belongs to Router, not common for all components. Signed-off-by: Viet Nguyen Duc <[email protected]>
SeleniumHQ · Dec 27, 2024 · d01680c · d01680c
1 parent 325307a
commit d01680c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/charts/selenium-grid/CONFIGURATION.md b/charts/selenium-grid/CONFIGURATION.md
@@ -173,6 +173,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | components.router.imageTag | string | `nil` | Router image tag (this overwrites global.seleniumGrid.imageTag parameter) |
 | components.router.imagePullPolicy | string | `"IfNotPresent"` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
 | components.router.imagePullSecret | string | `""` | Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) |
+| components.router.subPath | string | `""` | Custom sub path for Router |
 | components.router.disableUI | bool | `false` | Disable the Grid UI |
 | components.router.extraEnvironmentVariables | list | `[]` | Specify extra environment variables for Router |
 | components.router.extraEnvFrom | list | `[]` | Specify extra environment variables from ConfigMap and Secret for Router |
@@ -284,7 +285,6 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | components.sessionQueue.tolerations | list | `[]` | Tolerations for Session Queue pods |
 | components.sessionQueue.nodeSelector | object | `{}` | Node selector for Session Queue pods |
 | components.sessionQueue.priorityClassName | string | `""` | Priority class name for Session Queue pods |
-| components.subPath | string | `""` | Custom sub path for all components |
 | components.extraEnvironmentVariables | list | `[]` | Custom environment variables for all components |
 | components.extraEnvFrom | list | `[]` | Custom environment variables by sourcing entire configMap, Secret, etc. for all components |
 | hub.imageRegistry | string | `nil` | Registry to pull the image (this overwrites global.seleniumGrid.imageRegistry parameter) |

diff --git a/charts/selenium-grid/templates/_helpers.tpl b/charts/selenium-grid/templates/_helpers.tpl
@@ -762,7 +762,7 @@ Graphql Url for internal monitoring exporter
 {{- define "seleniumGrid.url.subPath" -}}
 {{- $subPath := "" -}}
 {{- if $.Values.isolateComponents -}}
-  {{- $subPath = default $subPath $.Values.components.subPath -}}
+  {{- $subPath = default $subPath $.Values.components.router.subPath -}}
 {{- else -}}
   {{- $subPath = default $subPath $.Values.hub.subPath -}}
 {{- end -}}

diff --git a/charts/selenium-grid/templates/router-deployment.yaml b/charts/selenium-grid/templates/router-deployment.yaml
@@ -61,7 +61,7 @@ spec:
               value: '{{ template "seleniumGrid.sessionQueue.fullname" . }}.{{ .Release.Namespace }}'
             - name: SE_SESSION_QUEUE_PORT
               value: {{ .Values.components.sessionQueue.port | quote }}
-            {{- with .Values.components.subPath }}
+            {{- with .Values.components.router.subPath }}
             - name: SE_SUB_PATH
               value: {{ include "utils.trimTrailingSlash" . | quote }}
             {{- end }}

diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml
@@ -397,6 +397,8 @@ components:
     # -- Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/)
     imagePullSecret: ""
 
+    # -- Custom sub path for Router
+    subPath: ""
     # -- Disable the Grid UI
     disableUI: false
     # -- Specify extra environment variables for Router
@@ -691,9 +693,6 @@ components:
     # -- Priority class name for Session Queue pods
     priorityClassName: ""
 
-  # -- Custom sub path for all components
-  subPath: ""
-
   # -- Custom environment variables for all components
   extraEnvironmentVariables: []
     # - name: SE_JAVA_OPTS

diff --git a/tests/charts/ci/base-subPath-values.yaml b/tests/charts/ci/base-subPath-values.yaml
@@ -23,4 +23,5 @@ hub:
   subPath: *gridAppRoot
 
 components:
-  subPath: *gridAppRoot
+  router:
+    subPath: *gridAppRoot
diff --git a/tests/charts/refValues/sample-aws.yaml b/tests/charts/refValues/sample-aws.yaml
@@ -49,7 +49,8 @@ hub:
   subPath: *gridAppRoot
 
 components:
-  subPath: *gridAppRoot
+  router:
+    subPath: *gridAppRoot
 
 chromeNode:
   extraEnvironmentVariables: &extraEnvironmentVariablesNodes

diff --git a/tests/charts/refValues/simplex-minikube.yaml b/tests/charts/refValues/simplex-minikube.yaml
@@ -62,8 +62,8 @@ hub:
   serviceType: NodePort
 
 components:
-  subPath: *gridAppRoot
   router:
+    subPath: *gridAppRoot
     serviceType: NodePort
 
 chromeNode:

diff --git a/tests/charts/templates/render/dummy.yaml b/tests/charts/templates/render/dummy.yaml
@@ -92,8 +92,8 @@ ingress:
 isolateComponents: true
 
 components:
-  subPath: *gridAppRoot
   router:
+    subPath: *gridAppRoot
     disableUI: true
     annotations:
       "restartOnUpdate": "true"

diff --git a/tests/charts/templates/render/dummy_solution.yaml b/tests/charts/templates/render/dummy_solution.yaml
@@ -93,8 +93,8 @@ selenium-grid:
   isolateComponents: true
 
   components:
-    subPath: *gridAppRoot
     router:
+      subPath: *gridAppRoot
       disableUI: true
       serviceType: NodePort
       extraEnvironmentVariables: