Skip to content

Commit 8b8bc3a

Browse files
committed
Update config key for relayUrl
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 6612d73 commit 8b8bc3a

File tree

8 files changed

+16
-2
lines changed

8 files changed

+16
-2
lines changed

charts/selenium-grid/CONFIGURATION.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
593593
| edgeNode.sidecars | list | `[]` | It is used to add sidecars proxy in the same pod of the browser node. It means it will add a new container to the deployment itself. It should be set using the --set-json option |
594594
| edgeNode.videoRecorder | object | `{}` | Override specific video recording settings for edge node |
595595
| relayNode.enabled | bool | `false` | Enable relay nodes |
596+
| relayNode.relayUrl | string | `""` | Specify another Grid, another network, or a cloud vendor that you wish to connect to (e.g. https://ondemand.us-west-1.saucelabs.com/wd/hub) |
596597
| relayNode.deploymentEnabled | bool | `true` | NOTE: Only used when autoscaling.enabled is false Enable creation of Deployment true (default) - if you want long-living pods false - for provisioning your own custom type such as Jobs |
597598
| relayNode.updateStrategy | object | `{"type":"RollingUpdate"}` | Global update strategy will be overwritten by individual component |
598599
| relayNode.replicas | int | `1` | Number of relay nodes |

charts/selenium-grid/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,11 @@ For example [multiple-nodes-platform.yaml](./multiple-nodes-platform.yaml) file,
360360

361361
For example [multiple-nodes-platform-version.yaml](./multiple-nodes-platform-version.yaml) file, it defines multiple scalers with `platformName: 'Linux'` and last few previous stable versions per browser node to scale against requests with `browserVersion` and `platformName` capabilities.
362362

363+
To extend your Grid, you can use Relay Node (which allows you to route Grid tests to another Grid, another network, or a cloud vendor).
364+
Besides on-prem browser Nodes with Linux-based, you also can serve test requests with other platforms, browsers or even mobile devices which provided by cloud vendors.
365+
Your teams will not worry about the underlying infrastructure, they just request to the single Grid endpoint hosted in your organization.
366+
Check out values file [multiple-nodes-platform-relay.yaml](./multiple-nodes-platform-relay.yaml) for more details.
367+
363368
While deploying the chart, you can quickly use these extra values files by passing the file via `--values` flag to apply.
364369

365370
### Settings fixed-sized thread pool for the Distributor to create new sessions

charts/selenium-grid/multiple-nodes-platform-relay.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,13 @@ crossBrowsers:
5656

5757
relayNode:
5858
enabled: true
59+
# relayUrl: "https://ondemand.$SAUCE_REGION.saucelabs.com:443/wd/hub"
5960
videoRecorder:
6061
enabled: false
6162
extraEnvironmentVariables:
6263
# - name: SAUCE_REGION
6364
# value: "<your_SAUCE_REGION>"
65+
# Or can give relay url directly to environment variable SE_NODE_RELAY_URL. Value can be referring to value of existing env vars.
6466
# - name: SE_NODE_RELAY_URL
6567
# value: "https://ondemand.$SAUCE_REGION.saucelabs.com:443/wd/hub"
6668
extraEnvFrom:

charts/selenium-grid/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,10 @@ template:
369369
value: {{ $nodeCustomCapabilities | quote }}
370370
- name: SE_DRAIN_AFTER_SESSION_COUNT
371371
value: {{ and (eq (include "seleniumGrid.useKEDA" $) "true") (eq .Values.autoscaling.scalingType "job") | ternary $nodeMaxSessions 0 | quote }}
372+
{{- with .node.relayUrl }}
373+
- name: SE_NODE_RELAY_URL
374+
value: {{ . | quote }}
375+
{{- end }}
372376
{{- if and (eq (include "seleniumGrid.useKEDA" $) "true") }}
373377
- name: SE_NODE_BROWSER_NAME
374378
value: {{ if hasKey .node.hpa "browserName" }}{{ .node.hpa.browserName | quote }}{{ else }}""{{ end }}

charts/selenium-grid/values.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1704,7 +1704,8 @@ edgeNode:
17041704
relayNode:
17051705
# -- Enable relay nodes
17061706
enabled: false
1707-
1707+
# -- Specify another Grid, another network, or a cloud vendor that you wish to connect to (e.g. https://ondemand.us-west-1.saucelabs.com/wd/hub)
1708+
relayUrl: ""
17081709
# -- NOTE: Only used when autoscaling.enabled is false
17091710
# Enable creation of Deployment
17101711
# true (default) - if you want long-living pods

tests/charts/ci/DeploymentAutoscaling-values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ firefoxNode:
103103

104104
# Configuration for relay nodes
105105
relayNode:
106+
relayUrl: "https://ondemand.$SAUCE_REGION.saucelabs.com:443/wd/hub"
106107
extraEnvFrom:
107108
- secretRef:
108109
name: test-cloud-credentials

tests/charts/ci/JobAutoscaling-values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ firefoxNode:
4848
enabled: *livenessProbe
4949
# Configuration for relay nodes
5050
relayNode:
51+
relayUrl: "https://ondemand.$SAUCE_REGION.saucelabs.com:443/wd/hub"
5152
extraEnvFrom:
5253
- secretRef:
5354
name: test-cloud-credentials

tests/charts/make/chart_test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,6 @@ fi
358358
if [ "${RENDER_HELM_TEMPLATE_ONLY}" != "true" ]; then
359359
kubectl create secret generic -n ${SELENIUM_NAMESPACE} test-cloud-credentials \
360360
--from-literal=SAUCE_REGION=${SAUCE_REGION} \
361-
--from-literal=SE_NODE_RELAY_URL="https://ondemand.\$SAUCE_REGION.saucelabs.com:443/wd/hub" \
362361
--dry-run=client -o yaml | kubectl apply -n ${SELENIUM_NAMESPACE} -f -
363362
fi
364363

0 commit comments

Comments
 (0)