Skip to content

Commit 160c87f

Browse files
VietND96VietND96
authored
Merge branch 'trunk' into renovate/kube-prometheus-stack-69.x
2 parents 6295110 + 3ede74e commit 160c87f

File tree

53 files changed

+124
-338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+124
-338
lines changed

‎.ffmpeg/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM ubuntu:noble AS builder
22
ARG FFMPEG_VERSION="7.1"
3-
ARG RCLONE_VER="v1.69.0"
3+
ARG RCLONE_VER="v1.69.1"
44
ARG GO_VERSION="latest"
5+
ARG GO_CRYPTO_VERSION="v0.35.0"
6+
ARG GO_OAUTH2_VERSION="v0.27.0"
57

68
USER root
79

@@ -32,9 +34,9 @@ RUN cd /usr/local/src \
3234
&& cd rclone \
3335
&& git checkout ${RCLONE_VER} \
3436
# Patch deps version in go.mod to fix CVEs
35-
# && sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
36-
# && sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
37-
# && go mod tidy \
37+
&& sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
38+
&& sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
39+
&& go mod tidy \
3840
# Build rclone
3941
&& make \
4042
&& mv ~/go/bin/rclone /usr/local/bin/ \

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
test-strategy: job_https
7171
cluster: 'minikube'
7272
helm-version: 'v3.14.3'
73-
docker-version: '26.1.4'
73+
docker-version: '27.5.1'
7474
python-version: '3.11'
7575
test-upgrade: true
7676
service-mesh: false
@@ -79,7 +79,7 @@ jobs:
7979
test-strategy: job_hostname
8080
cluster: 'minikube'
8181
helm-version: 'v3.15.4'
82-
docker-version: '26.1.4'
82+
docker-version: '27.5.1'
8383
python-version: '3.12'
8484
test-upgrade: true
8585
service-mesh: false
@@ -88,7 +88,7 @@ jobs:
8888
test-strategy: deployment_https
8989
cluster: 'minikube'
9090
helm-version: 'v3.16.4'
91-
docker-version: '27.4.1'
91+
docker-version: '28.0.1'
9292
python-version: '3.13'
9393
test-upgrade: true
9494
service-mesh: false
@@ -97,7 +97,7 @@ jobs:
9797
test-strategy: playwright_connect_grid
9898
cluster: 'minikube'
9999
helm-version: 'v3.17.0'
100-
docker-version: '26.1.4'
100+
docker-version: '28.0.1'
101101
python-version: '3.10'
102102
test-upgrade: true
103103
service-mesh: true

‎.github/workflows/k8s-scaling-test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,37 +65,37 @@ jobs:
6565
test-strategy: test_k8s_autoscaling_job_count_strategy_default_in_chaos
6666
cluster: 'minikube'
6767
helm-version: 'v3.16.4'
68-
docker-version: '27.4.1'
68+
docker-version: '28.0.1'
6969
python-version: '3.13'
7070
- k8s-version: 'v1.31.5'
7171
test-strategy: test_k8s_autoscaling_job_count_strategy_default_with_node_max_sessions
7272
cluster: 'minikube'
7373
helm-version: 'v3.16.4'
74-
docker-version: '27.4.1'
74+
docker-version: '28.0.1'
7575
python-version: '3.13'
7676
- k8s-version: 'v1.31.5'
7777
test-strategy: test_k8s_autoscaling_job_count_strategy_default
7878
cluster: 'minikube'
7979
helm-version: 'v3.16.4'
80-
docker-version: '27.4.1'
80+
docker-version: '28.0.1'
8181
python-version: '3.13'
8282
- k8s-version: 'v1.31.5'
8383
test-strategy: test_k8s_autoscaling_deployment_count_in_chaos
8484
cluster: 'minikube'
8585
helm-version: 'v3.16.4'
86-
docker-version: '27.4.1'
86+
docker-version: '28.0.1'
8787
python-version: '3.13'
8888
- k8s-version: 'v1.31.5'
8989
test-strategy: test_k8s_autoscaling_deployment_count_with_node_max_sessions
9090
cluster: 'minikube'
9191
helm-version: 'v3.16.4'
92-
docker-version: '27.4.1'
92+
docker-version: '28.0.1'
9393
python-version: '3.13'
9494
- k8s-version: 'v1.31.5'
9595
test-strategy: test_k8s_autoscaling_deployment_count
9696
cluster: 'minikube'
9797
helm-version: 'v3.16.4'
98-
docker-version: '27.4.1'
98+
docker-version: '28.0.1'
9999
python-version: '3.13'
100100
env:
101101
CLUSTER: ${{ matrix.cluster }}

‎.github/workflows/release-chrome-versions.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jobs:
6060
runs-on: ubuntu-24.04
6161
permissions: write-all
6262
strategy:
63-
max-parallel: 1
6463
fail-fast: false
6564
matrix:
6665
browser-version: ${{ fromJSON(github.event.inputs.browser-versions)}}
@@ -163,6 +162,10 @@ jobs:
163162
GRID_VERSION: ${{ needs.deploy.outputs.GRID_VERSION }}
164163
- name: Create CHANGELOG directory
165164
run: mkdir -p ./CHANGELOG/${{ env.GRID_VERSION }}
165+
- name: Fetch latest version
166+
run: |
167+
python3 -m pip install -r tests/requirements.txt
168+
python3 tests/build-backward-compatible/fetch_version.py
166169
- name: Download results
167170
uses: actions/download-artifact@v4
168171
with:

‎.github/workflows/release-edge-versions.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jobs:
6060
runs-on: ubuntu-24.04
6161
permissions: write-all
6262
strategy:
63-
max-parallel: 1
6463
fail-fast: false
6564
matrix:
6665
browser-version: ${{ fromJSON(github.event.inputs.browser-versions)}}
@@ -163,6 +162,10 @@ jobs:
163162
GRID_VERSION: ${{ needs.deploy.outputs.GRID_VERSION }}
164163
- name: Create CHANGELOG directory
165164
run: mkdir -p ./CHANGELOG/${{ env.GRID_VERSION }}
165+
- name: Fetch latest version
166+
run: |
167+
python3 -m pip install -r tests/requirements.txt
168+
python3 tests/build-backward-compatible/fetch_version.py
166169
- name: Download results
167170
uses: actions/download-artifact@v4
168171
with:

‎.github/workflows/release-firefox-versions.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jobs:
6060
runs-on: ubuntu-24.04
6161
permissions: write-all
6262
strategy:
63-
max-parallel: 1
6463
fail-fast: false
6564
matrix:
6665
browser-version: ${{ fromJSON(github.event.inputs.browser-versions)}}
@@ -163,6 +162,10 @@ jobs:
163162
GRID_VERSION: ${{ needs.deploy.outputs.GRID_VERSION }}
164163
- name: Create CHANGELOG directory
165164
run: mkdir -p ./CHANGELOG/${{ env.GRID_VERSION }}
165+
- name: Fetch latest version
166+
run: |
167+
python3 -m pip install -r tests/requirements.txt
168+
python3 tests/build-backward-compatible/fetch_version.py
166169
- name: Download results
167170
uses: actions/download-artifact@v4
168171
with:

‎Base/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG GRPC_VERSION=1.70.0
1313
ARG NETTY_VERSION=4.1.118.Final
1414
ARG CS_VERSION=2.1.18
1515
ARG POSTGRESQL_VERSION=42.7.5
16-
ARG ENVSUBST_VERSION=1.4.2-patch.124
16+
ARG ENVSUBST_VERSION=1.4.3
1717

1818
#Arguments to define the user running Selenium
1919
ARG SEL_USER=seluser
@@ -161,7 +161,7 @@ COPY --chown="${SEL_UID}:${SEL_GID}" certs/tls.crt certs/tls.key certs/server.jk
161161
# Add envsubst binary
162162
#===================================================
163163
RUN ARCH=$(if [ "$(dpkg --print-architecture)" = "amd64" ]; then echo "x86_64"; else echo "$(dpkg --print-architecture)"; fi) \
164-
&& curl -fsSL https://github.com/NDViet/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst \
164+
&& curl -fsSL https://github.com/a8m/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst \
165165
&& chmod +x envsubst \
166166
&& mv envsubst /usr/local/bin \
167167
&& ln -sf /usr/local/bin/envsubst /usr/bin/envsubst

‎Distributor/Dockerfile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,9 @@ ENV SE_SESSION_REQUEST_TIMEOUT="300" \
2323
SE_SESSION_RETRY_INTERVAL="15" \
2424
# In seconds, maps to "--healthcheck-interval"
2525
SE_HEALTHCHECK_INTERVAL="120" \
26+
SE_EVENT_BUS_PUBLISH_PORT="4442" \
27+
SE_EVENT_BUS_SUBSCRIBE_PORT="4443" \
28+
SE_SESSIONS_MAP_PORT="5556" \
29+
SE_SESSION_QUEUE_PORT="5559" \
30+
SE_DISTRIBUTOR_PORT="5553" \
2631
SE_OTEL_SERVICE_NAME="selenium-distributor"

‎ENV_VARIABLES.md‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
| SE_NODE_GRID_URL | | Node config, public URL of the Grid as a whole (typically the address of the Hub or the Router) | --grid-url |
2727
| SE_HUB_HOST | | Hub config, host address the Hub should listen on | --host |
2828
| SE_ROUTER_HOST | | Router config, host address the Router should listen on | --host |
29-
| SE_HUB_PORT | | Hub config, port the Hub should listen on (default 4444) | --port |
30-
| SE_ROUTER_PORT | | Router config, port the Router should listen on (default 4444) | --port |
29+
| SE_HUB_PORT | 4444 | Hub config, port the Hub should listen on (default 4444) | --port |
30+
| SE_ROUTER_PORT | 4444 | Router config, port the Router should listen on (default 4444) | --port |
3131
| SE_NODE_GRID_GRAPHQL_URL | | Video recording config, GraphQL URL to query test metadata for dynamic file name | |
3232
| SE_VIDEO_FILE_NAME_TRIM_REGEX | [:alnum:]-_ | Bash regex to trim the file name if it is too long | |
3333
| SE_VIDEO_FILE_NAME_SUFFIX | | Append a suffix session id along with test metadata | |
@@ -39,7 +39,7 @@
3939
| SE_RCLONE_ | | | |
4040
| SE_OPTS | | | |
4141
| SE_EVENT_BUS_HOST | | | |
42-
| SE_EVENT_BUS_PORT | | | |
42+
| SE_EVENT_BUS_PORT | 5557 | | |
4343
| SE_LOG_LEVEL | INFO | | |
4444
| SE_HTTP_LOGS | false | | |
4545
| SE_STRUCTURED_LOGS | false | | |
@@ -92,17 +92,15 @@
9292
| SE_HEALTHCHECK_INTERVAL | 120 | | |
9393
| SE_RELAX_CHECKS | true | | |
9494
| SE_SESSION_QUEUE_HOST | | | |
95-
| SE_SESSION_QUEUE_PORT | | | |
95+
| SE_SESSION_QUEUE_PORT | 5559 | | |
9696
| SE_VIDEO_FOLDER | | | |
9797
| SE_LOG_LISTEN_GRAPHQL | | | |
9898
| SE_NODE_PRESTOP_WAIT_STRATEGY | | | |
99-
| SE_SESSIONS_HOST | | | |
100-
| SE_SESSIONS_PORT | | | |
10199
| SE_SESSIONS_MAP_EXTERNAL_DATASTORE | false | | |
102100
| SE_SESSIONS_MAP_HOST | | | |
103-
| SE_SESSIONS_MAP_PORT | | | |
101+
| SE_SESSIONS_MAP_PORT | 5556 | | |
104102
| SE_DISTRIBUTOR_HOST | | | |
105-
| SE_DISTRIBUTOR_PORT | | | |
103+
| SE_DISTRIBUTOR_PORT | 5553 | | |
106104
| SE_GRID_URL | | | |
107105
| SE_NODE_DOCKER_CONFIG_FILENAME | | | |
108106
| SE_NODE_GRACEFUL_SHUTDOWN | | | |

‎EventBus/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-eventbus.sh \
2222

2323
COPY selenium-grid-eventbus.conf /etc/supervisor/conf.d/
2424

25-
ENV SE_OTEL_SERVICE_NAME="selenium-event-bus"
25+
ENV SE_OTEL_SERVICE_NAME="selenium-event-bus" \
26+
SE_EVENT_BUS_PUBLISH_PORT="4442" \
27+
SE_EVENT_BUS_SUBSCRIBE_PORT="4443" \
28+
SE_EVENT_BUS_PORT="5557"

0 commit comments

Comments
 (0)