Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(chart): Remove trailing slash from default subPath value #2076

Merged
merged 1 commit into from
Dec 22, 2023
Merged

fix(chart): Remove trailing slash from default subPath value #2076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/selenium-grid/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: selenium-grid
description: A Helm chart for creating a Selenium Grid Server in Kubernetes
type: application
version: 0.26.3
version: 0.26.4
appVersion: 4.16.1-20231219
icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion charts/selenium-grid/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Get the url of the grid. If the external url can be figured out from the ingress
{{- end -}}

{{- define "seleniumGrid.url.subPath" -}}
{{- $subPath := "/" -}}
{{- $subPath := "" -}}
{{- if $.Values.isolateComponents -}}
{{- $subPath = default $subPath $.Values.components.subPath -}}
{{- else -}}
Expand Down
4 changes: 3 additions & 1 deletion charts/selenium-grid/templates/hub-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ spec:
failureThreshold: {{ .Values.hub.readinessProbe.failureThreshold }}
{{- end }}
env:
{{- with .Values.hub.subPath }}
- name: SE_SUB_PATH
value: {{ .Values.hub.subPath }}
value: {{ . | quote }}
{{- end }}
{{- if eq .Values.basicAuth.enabled true}}
- name: ROUTER_USERNAME
value: {{ .Values.basicAuth.username }}
Expand Down
4 changes: 3 additions & 1 deletion charts/selenium-grid/templates/router-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ spec:
value: {{ template "seleniumGrid.sessionQueue.fullname" . }}
- name: SE_SESSION_QUEUE_PORT
value: {{ .Values.components.sessionQueue.port | quote }}
{{- with .Values.components.subPath }}
- name: SE_SUB_PATH
value: {{ .Values.components.subPath }}
value: {{ . | quote }}
{{- end }}
{{- if eq .Values.basicAuth.enabled true}}
- name: ROUTER_USERNAME
value: {{ .Values.basicAuth.username }}
Expand Down
4 changes: 2 additions & 2 deletions charts/selenium-grid/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ components:
priorityClassName: ""

# Custom sub path for all components
subPath: /
subPath: ""

# Custom environment variables for all components
extraEnvironmentVariables:
Expand Down Expand Up @@ -338,7 +338,7 @@ hub:
periodSeconds: 10
successThreshold: 1
# Custom sub path for the hub deployment
subPath: /
subPath: ""
# Custom environment variables for selenium-hub
extraEnvironmentVariables:
# - name: SE_JAVA_OPTS
Expand Down