Skip to content

Commit f39a9da

Browse files
VietND96VietND96
committed
[docs] pre-update for release docs generation
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 677168f commit f39a9da

File tree

7 files changed

+30
-24
lines changed

7 files changed

+30
-24
lines changed

‎.github/workflows/helm-chart-test.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -37,40 +37,40 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
include:
40-
- k8s-version: 'v1.25.16'
40+
- k8s-version: 'v1.26.15'
4141
test-strategy: job
42-
cluster: 'kind'
42+
cluster: 'minikube'
4343
helm-version: 'v3.10.3'
4444
test-existing-keda: true
4545
test-upgrade: true
46-
- k8s-version: 'v1.26.15'
46+
- k8s-version: 'v1.27.13'
4747
test-strategy: deployment
4848
cluster: 'minikube'
4949
helm-version: 'v3.11.3'
5050
test-existing-keda: true
5151
test-upgrade: true
52-
- k8s-version: 'v1.27.12'
52+
- k8s-version: 'v1.28.9'
5353
test-strategy: job_https
5454
cluster: 'minikube'
5555
helm-version: 'v3.12.3'
5656
test-existing-keda: true
5757
test-upgrade: true
58-
- k8s-version: 'v1.28.8'
58+
- k8s-version: 'v1.29.4'
5959
test-strategy: job_hostname
6060
cluster: 'minikube'
6161
helm-version: 'v3.13.3'
6262
test-existing-keda: false
6363
test-upgrade: true
64-
- k8s-version: 'v1.29.3'
64+
- k8s-version: 'v1.30.0'
6565
test-strategy: deployment_https
6666
cluster: 'minikube'
67-
helm-version: 'v3.14.3'
67+
helm-version: 'v3.14.4'
6868
test-existing-keda: false
6969
test-upgrade: true
7070
env:
7171
CLUSTER: ${{ matrix.cluster }}
7272
KUBERNETES_VERSION: ${{ matrix.k8s-version }}
73-
ARTIFACT_NAME: ${{ matrix.k8s-version }}-${{ matrix.test-strategy }}
73+
ARTIFACT_NAME: "${{ matrix.k8s-version }}-${{ matrix.test-strategy }}"
7474
HELM_VERSION: ${{ matrix.helm-version }}
7575
TEST_EXISTING_KEDA: ${{ matrix.test-existing-keda }}
7676
TEST_UPGRADE_CHART: ${{ matrix.test-upgrade }}
@@ -155,7 +155,7 @@ jobs:
155155
if: always()
156156
uses: actions/upload-artifact@main
157157
with:
158-
name: ${{ env.ARTIFACT_NAME }}_${{ env.CHART_FILE_NAME }}
158+
name: "${{ env.ARTIFACT_NAME }}_${{ env.CHART_FILE_NAME }}"
159159
path: ${{ env.CHART_PACKAGE_PATH }}
160160
- name: Upload chart test artifacts
161161
if: always()

‎NodeDocker/config.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ configs = [
1414
# socat -4 TCP-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock
1515
url = "http://127.0.0.1:2375"
1616
# Docker image used for video recording
17-
video-image = "selenium/video:ffmpeg-6.1-20240402"
17+
video-image = "selenium/video:ffmpeg-7.0-20240402"
1818

1919
# Uncomment the following section if you are running the node on a separate VM
2020
# Fill out the placeholders with appropriate values

‎README.md

+10-4
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ ___
512512

513513
## Video recording
514514

515-
Tests execution can be recorded by using the `selenium/video:ffmpeg-6.1-20240402`
515+
Tests execution can be recorded by using the `selenium/video:ffmpeg-7.0-20240402`
516516
Docker image. One container is needed per each container where a browser is running. This means if you are
517517
running 5 Nodes/Standalone containers, you will need 5 video containers, the mapping is 1-1.
518518

@@ -539,7 +539,7 @@ This example shows how to start the containers manually:
539539
``` bash
540540
$ docker network create grid
541541
$ docker run -d -p 4444:4444 -p 6900:5900 --net grid --name selenium --shm-size="2g" selenium/standalone-chrome:4.19.1-20240402
542-
$ docker run -d --net grid --name video -v /tmp/videos:/videos selenium/video:ffmpeg-6.1-20240402
542+
$ docker run -d --net grid --name video -v /tmp/videos:/videos selenium/video:ffmpeg-7.0-20240402
543543
# Run your tests
544544
$ docker stop video && docker rm video
545545
$ docker stop selenium && docker rm selenium
@@ -618,6 +618,8 @@ configs = [
618618
"selenium/standalone-edge:4.19.1-20240402", '{"browserName": "MicrosoftEdge"}'
619619
]
620620
621+
host-config-keys = ["Dns", "DnsOptions", "DnsSearch", "ExtraHosts", "Binds"]
622+
621623
# URL for connecting to the docker daemon
622624
# Most simple approach, leave it as http://127.0.0.1:2375, and mount /var/run/docker.sock.
623625
# 127.0.0.1 is used because internally the container uses socat when /var/run/docker.sock is mounted
@@ -628,7 +630,7 @@ configs = [
628630
# Linux: varies from machine to machine, please mount /var/run/docker.sock. If this does not work, please create an issue.
629631
url = "http://127.0.0.1:2375"
630632
# Docker image used for video recording
631-
video-image = "selenium/video:ffmpeg-6.1-20240402"
633+
video-image = "selenium/video:ffmpeg-7.0-20240402"
632634
633635
# Uncomment the following section if you are running the node on a separate VM
634636
# Fill out the placeholders with appropriate values
@@ -637,6 +639,10 @@ video-image = "selenium/video:ffmpeg-6.1-20240402"
637639
#port = <port-from-node-machine>
638640
```
639641

642+
With the optional config key `host-config-keys` under section [docker] in a config.toml file (or CLI option --docker-host-config-keys). Users can specify a list of docker host configuration keys that should be passed to browser containers.
643+
644+
Valid key names for Docker host config can be found in the Docker API [documentation](https://docs.docker.com/engine/api/latest/#tag/Container/operation/ContainerCreate) or via the command `docker inspect` the node-docker container.
645+
640646
### Execution with Hub & Node roles
641647

642648
This can be expanded to a full Grid deployment, all components deployed individually. The overall
@@ -759,7 +765,7 @@ configs = [
759765
# Linux: varies from machine to machine, please mount /var/run/docker.sock. If this does not work, please create an issue.
760766
url = "http://127.0.0.1:2375"
761767
# Docker image used for video recording
762-
video-image = "selenium/video:ffmpeg-6.1-20240402"
768+
video-image = "selenium/video:ffmpeg-7.0-20240402"
763769
764770
# Uncomment the following section if you are running the node on a separate VM
765771
# Fill out the placeholders with appropriate values

‎charts/selenium-grid/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ For now, global configuration supported is:
305305
| `global.seleniumGrid.imageRegistry` | `selenium` | Distribution registry to pull images |
306306
| `global.seleniumGrid.imageTag` | `4.19.1-20240402` | Image tag for all selenium components |
307307
| `global.seleniumGrid.nodesImageTag` | `4.19.1-20240402` | Image tag for browser's nodes |
308-
| `global.seleniumGrid.videoImageTag` | `ffmpeg-6.1-20240402` | Image tag for browser's video recorder |
308+
| `global.seleniumGrid.videoImageTag` | `ffmpeg-7.0-20240402` | Image tag for browser's video recorder |
309309
| `global.seleniumGrid.imagePullSecret` | `""` | Pull secret to be used for all images |
310310
| `global.seleniumGrid.imagePullSecret` | `""` | Pull secret to be used for all images |
311311
| `global.seleniumGrid.affinity` | `{}` | Affinity assigned globally |
@@ -844,7 +844,7 @@ This table contains the configuration parameters of the chart and their default
844844
| `videoRecorder.enabled` | `false` | Enable video recorder for node |
845845
| `videoRecorder.imageRegistry` | `nil` | Distribution registry to pull the image (this overwrites `.global.seleniumGrid.imageRegistry` value) |
846846
| `videoRecorder.imageName` | `video` | Selenium video recorder image name |
847-
| `videoRecorder.imageTag` | `ffmpeg-6.1-20240402` | Image tag of video recorder |
847+
| `videoRecorder.imageTag` | `ffmpeg-7.0-20240402` | Image tag of video recorder |
848848
| `videoRecorder.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
849849
| `videoRecorder.uploader.enabled` | `false` | Enable the uploader for videos |
850850
| `videoRecorder.uploader.destinationPrefix` | `` | Destination for uploading video file. It is following `rclone` config |

‎charts/selenium-grid/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ global:
1111
# Image tag for browser's nodes
1212
nodesImageTag: 4.19.1-20240402
1313
# Image tag for browser's video recorder
14-
videoImageTag: ffmpeg-6.1-20240402
14+
videoImageTag: ffmpeg-7.0-20240402
1515
# Pull secret for all components, can be overridden individually
1616
imagePullSecret: ""
1717
# Log level for all components. Possible values describe here: https://www.selenium.dev/documentation/grid/configuration/cli_options/#logging
@@ -1066,7 +1066,7 @@ videoRecorder:
10661066
# Image of video recorder
10671067
imageName: video
10681068
# Image of video recorder
1069-
# imageTag: ffmpeg-6.1-20240402
1069+
# imageTag: ffmpeg-7.0-20240402
10701070
# Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images)
10711071
imagePullPolicy: IfNotPresent
10721072
# Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/)

‎docker-compose-v3-video-upload.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ services:
3535
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
3636

3737
chrome_video:
38-
image: selenium/video:ffmpeg-6.1-20240402
38+
image: selenium/video:ffmpeg-7.0-20240402
3939
depends_on:
4040
- chrome
4141
environment:
@@ -56,7 +56,7 @@ services:
5656
- RCLONE_CONFIG_S3_NO_CHECK_BUCKET=true
5757

5858
edge_video:
59-
image: selenium/video:ffmpeg-6.1-20240402
59+
image: selenium/video:ffmpeg-7.0-20240402
6060
depends_on:
6161
- edge
6262
environment:
@@ -77,7 +77,7 @@ services:
7777
- RCLONE_CONFIG_S3_NO_CHECK_BUCKET=true
7878

7979
firefox_video:
80-
image: selenium/video:ffmpeg-6.1-20240402
80+
image: selenium/video:ffmpeg-7.0-20240402
8181
depends_on:
8282
- firefox
8383
environment:

‎docker-compose-v3-video.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ services:
3434
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
3535

3636
chrome_video:
37-
image: selenium/video:ffmpeg-6.1-20240402
37+
image: selenium/video:ffmpeg-7.0-20240402
3838
volumes:
3939
- /tmp/videos:/videos
4040
depends_on:
@@ -44,7 +44,7 @@ services:
4444
- FILE_NAME=chrome_video.mp4
4545

4646
edge_video:
47-
image: selenium/video:ffmpeg-6.1-20240402
47+
image: selenium/video:ffmpeg-7.0-20240402
4848
volumes:
4949
- /tmp/videos:/videos
5050
depends_on:
@@ -54,7 +54,7 @@ services:
5454
- FILE_NAME=edge_video.mp4
5555

5656
firefox_video:
57-
image: selenium/video:ffmpeg-6.1-20240402
57+
image: selenium/video:ffmpeg-7.0-20240402
5858
volumes:
5959
- /tmp/videos:/videos
6060
depends_on:

0 commit comments

Comments
 (0)