Skip to content

Commit a1082c2

Browse files
authored
fix(chart): Remove trailing slash from default subPath value (#2076)
1 parent c914033 commit a1082c2

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

charts/selenium-grid/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: selenium-grid
33
description: A Helm chart for creating a Selenium Grid Server in Kubernetes
44
type: application
5-
version: 0.26.3
5+
version: 0.26.4
66
appVersion: 4.16.1-20231219
77
icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png
88
dependencies:

charts/selenium-grid/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ Get the url of the grid. If the external url can be figured out from the ingress
400400
{{- end -}}
401401

402402
{{- define "seleniumGrid.url.subPath" -}}
403-
{{- $subPath := "/" -}}
403+
{{- $subPath := "" -}}
404404
{{- if $.Values.isolateComponents -}}
405405
{{- $subPath = default $subPath $.Values.components.subPath -}}
406406
{{- else -}}

charts/selenium-grid/templates/hub-deployment.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ spec:
6565
failureThreshold: {{ .Values.hub.readinessProbe.failureThreshold }}
6666
{{- end }}
6767
env:
68+
{{- with .Values.hub.subPath }}
6869
- name: SE_SUB_PATH
69-
value: {{ .Values.hub.subPath }}
70+
value: {{ . | quote }}
71+
{{- end }}
7072
{{- if eq .Values.basicAuth.enabled true}}
7173
- name: ROUTER_USERNAME
7274
value: {{ .Values.basicAuth.username }}

charts/selenium-grid/templates/router-deployment.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ spec:
4545
value: {{ template "seleniumGrid.sessionQueue.fullname" . }}
4646
- name: SE_SESSION_QUEUE_PORT
4747
value: {{ .Values.components.sessionQueue.port | quote }}
48+
{{- with .Values.components.subPath }}
4849
- name: SE_SUB_PATH
49-
value: {{ .Values.components.subPath }}
50+
value: {{ . | quote }}
51+
{{- end }}
5052
{{- if eq .Values.basicAuth.enabled true}}
5153
- name: ROUTER_USERNAME
5254
value: {{ .Values.basicAuth.username }}

charts/selenium-grid/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ components:
275275
priorityClassName: ""
276276

277277
# Custom sub path for all components
278-
subPath: /
278+
subPath: ""
279279

280280
# Custom environment variables for all components
281281
extraEnvironmentVariables:
@@ -338,7 +338,7 @@ hub:
338338
periodSeconds: 10
339339
successThreshold: 1
340340
# Custom sub path for the hub deployment
341-
subPath: /
341+
subPath: ""
342342
# Custom environment variables for selenium-hub
343343
extraEnvironmentVariables:
344344
# - name: SE_JAVA_OPTS

0 commit comments

Comments
 (0)