From cef9005d3525a3c548d825e1ef76ca368f70b791 Mon Sep 17 00:00:00 2001 From: Stefan Staude Date: Wed, 8 Apr 2020 22:43:45 +0200 Subject: [PATCH] [stable/selenium] Fix selenium configuration (#21839) * Fix selenium hub typo in environment variable GRID_CLEAN_UP_CYCLE Signed-off-by: Stefan Staude * Extend value.yaml documentation and fix timeout units Signed-off-by: Stefan Staude * Update selenium chart version to 1.0.11 Signed-off-by: Stefan Staude --- stable/selenium/Chart.yaml | 2 +- stable/selenium/README.md | 6 +++--- stable/selenium/templates/hub-deployment.yaml | 2 +- stable/selenium/values.yaml | 9 +++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/stable/selenium/Chart.yaml b/stable/selenium/Chart.yaml index 2423692415..42ed357758 100644 --- a/stable/selenium/Chart.yaml +++ b/stable/selenium/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: selenium -version: 1.0.10 +version: 1.0.11 appVersion: 3.141.59 description: Chart for selenium grid keywords: diff --git a/stable/selenium/README.md b/stable/selenium/README.md index 2dbec4488b..99f24333ee 100644 --- a/stable/selenium/README.md +++ b/stable/selenium/README.md @@ -65,9 +65,9 @@ The following table lists the configurable parameters of the Selenium chart and | `hub.gridNewSessionWaitTimeout` | | `nil` | | `hub.gridJettyMaxThreads` | | `nil` | | `hub.gridNodePolling` | | `nil` | -| `hub.gridCleanUpCycle` | | `nil` | -| `hub.gridTimeout` | | `nil` | -| `hub.gridBrowserTimeout` | | `nil` | +| `hub.gridCleanUpCycle` | Specifies how often the hub will poll running proxies for timed-out (i.e. hung) threads **(in ms)**. Must also specify "timeout" option | `nil` | +| `hub.gridTimeout` | Specifies the timeout before the server automatically kills a session that hasn't had any activity in the last X seconds.| `nil` | +| `hub.gridBrowserTimeout` | Number of seconds a browser session is allowed to hang while a WebDriver command is running | `nil` | | `hub.gridMaxSession` | | `nil` | | `hub.gridUnregisterIfStillDownAfter` | | `nil` | | `hub.seOpts` | Command line arguments to pass to hub | `nil` | diff --git a/stable/selenium/templates/hub-deployment.yaml b/stable/selenium/templates/hub-deployment.yaml index 1df9689961..450351c996 100644 --- a/stable/selenium/templates/hub-deployment.yaml +++ b/stable/selenium/templates/hub-deployment.yaml @@ -65,7 +65,7 @@ spec: value: {{ .Values.hub.gridNodePolling | quote }} {{- end }} {{- if .Values.hub.gridCleanUpCycle }} - - name: GRID_CLEANUP_CYCLE + - name: GRID_CLEAN_UP_CYCLE value: {{ .Values.hub.gridCleanUpCycle | quote }} {{- end }} {{- if .Values.hub.gridTimeout }} diff --git a/stable/selenium/values.yaml b/stable/selenium/values.yaml index 54953e99ba..b7f8a11603 100644 --- a/stable/selenium/values.yaml +++ b/stable/selenium/values.yaml @@ -109,16 +109,17 @@ hub: # # internal AWS ELB # service.beta.kubernetes.io/aws-load-balancer-internal: "0.0.0.0/0" - ## ref: https://seleniumhq.github.io/docs/grid.html#step_1_start_the_hub + ## ref: https://github.com/SeleniumHQ/selenium/wiki/Grid2#configuring-the-nodes + ## In milliseconds # gridNewSessionWaitTimeout: -1 # gridJettyMaxThreads: -1 ## In milliseconds # gridNodePolling: 5000 ## In milliseconds # gridCleanUpCycle: 5000 - ## In milliseconds - # gridTimeout: 30000 - ## In milliseconds + ## In seconds + # gridTimeout: 30 + ## In seconds # gridBrowserTimeout: 0 # gridMaxSession: 5 ## In milliseconds