Skip to content

Commit ef074ad

Browse files
VietND96VietND96
authored
Merge branch 'trunk' into renovate/kube-prometheus-stack-67.x
2 parents 596caac + c10b3d2 commit ef074ad

File tree

85 files changed

+2469
-848
lines changed

Some content is hidden

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

85 files changed

+2469
-848
lines changed

‎.ffmpeg/Dockerfile‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:noble AS builder
2-
ARG VERSION_FFMPEG="7.1"
3-
ARG VERSION_RCLONE="v1.68.2"
4-
ARG VERSION_GO="latest"
2+
ARG FFMPEG_VERSION="7.1"
3+
ARG RCLONE_VER="v1.68.2"
4+
ARG GO_VERSION="latest"
55
ARG GO_CRYPTO_VERSION="v0.31.0"
66
ARG GO_NET_VERSION="v0.33.0"
77

@@ -19,19 +19,19 @@ RUN apt-get update -qqy \
1919
&& apt-get -qyy clean \
2020
&& mkdir -p /usr/local/src
2121

22-
RUN if [ "${VERSION_GO}" = "latest" ]; then \
23-
VERSION_GO=$(curl -sk https://go.dev/dl/?mode=json | jq -r '.[0].version'); \
22+
RUN if [ "${GO_VERSION}" = "latest" ]; then \
23+
GO_VERSION=$(curl -sk https://go.dev/dl/?mode=json | jq -r '.[0].version'); \
2424
fi \
25-
&& curl -skLO https://go.dev/dl/$VERSION_GO.linux-$(dpkg --print-architecture).tar.gz \
26-
&& tar -xf $VERSION_GO.linux-$(dpkg --print-architecture).tar.gz -C /usr/local \
27-
&& rm -rf $VERSION_GO.linux-$(dpkg --print-architecture).tar.gz* \
25+
&& curl -skLO https://go.dev/dl/${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz \
26+
&& tar -xf ${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz -C /usr/local \
27+
&& rm -rf ${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz* \
2828
&& ln -sf /usr/local/go/bin/go /usr/bin/go \
2929
&& go version
3030

3131
RUN cd /usr/local/src \
3232
&& git clone https://github.com/rclone/rclone.git \
3333
&& cd rclone \
34-
&& git checkout $VERSION_RCLONE \
34+
&& git checkout ${RCLONE_VER} \
3535
# Patch deps version in go.mod to fix CVEs
3636
&& sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
3737
&& sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
@@ -57,8 +57,9 @@ RUN cd /usr/local/src \
5757
RUN cd /usr/local/src \
5858
&& git clone https://github.com/FFmpeg/FFmpeg.git \
5959
&& cd FFmpeg \
60-
&& git checkout release/$VERSION_FFMPEG \
61-
&& PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" ./configure \
60+
&& git checkout release/${FFMPEG_VERSION} \
61+
&& rm -rf .git \
62+
&& PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" FFMPEG_VERSION=${FFMPEG_VERSION} ./configure \
6263
--prefix="/usr/local" \
6364
--extra-cflags="-I/usr/local/include" \
6465
--extra-ldflags="-L/usr/local/lib" \
@@ -87,3 +88,5 @@ RUN apt-get -qqy update \
8788
RUN ldd /usr/local/bin/ffmpeg \
8889
&& ffmpeg -version \
8990
&& rclone --version
91+
92+
USER 101

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ body:
5656
attributes:
5757
label: Docker Selenium version (image tag)
5858
description: What version of Docker Selenium are you using?
59-
placeholder: 4.27.0-20241204? Please use the full tag, avoid "latest"
59+
placeholder: 4.27.0-20241225? Please use the full tag, avoid "latest"
6060
validations:
6161
required: true
6262
- type: input

‎.github/workflows/build-test.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Build & test
22

33
on:
44
workflow_call:
5+
secrets:
6+
DOCKER_USERNAME:
7+
required: false
8+
DOCKER_PASSWORD:
9+
required: false
510
inputs:
611
release:
712
description: 'Test a new release process'
@@ -41,7 +46,7 @@ env:
4146
jobs:
4247
docker-test:
4348
if: contains(toJson(github.event.commits), '[skip test]') == false
44-
name: Test Seleium Grid on Docker
49+
name: Test Selenium Grid on Docker
4550
uses: ./.github/workflows/docker-test.yml
4651
with:
4752
release: ${{ inputs.release == 'true' }}

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
name: Build and Test
3838
if: contains(toJson(github.event.commits), '[deploy]') == true || (github.event_name == 'workflow_dispatch' && github.event.inputs.skip-test == 'false')
3939
uses: ./.github/workflows/build-test.yml
40+
secrets: inherit
4041
with:
4142
release: ${{ github.event.inputs.stable || true }}
4243

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
name: Build and Test Nightly
1616
if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.skip-test == 'false')
1717
uses: ./.github/workflows/build-test.yml
18+
secrets: inherit
1819
with:
1920
release: false
2021

‎.keda/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ The stable implementation will be merged to the upstream KEDA repository frequen
1313
Replace the image registry and tag of these KEDA components with the patched image tag:
1414

1515
```bash
16-
docker pull selenium/keda:2.16.0-selenium-grid-20241204
17-
docker pull selenium/keda-metrics-apiserver:2.16.0-selenium-grid-20241204
18-
docker pull selenium/keda-admission-webhooks:2.16.0-selenium-grid-20241204
16+
docker pull selenium/keda:2.16.1-selenium-grid-20241225
17+
docker pull selenium/keda-metrics-apiserver:2.16.1-selenium-grid-20241225
18+
docker pull selenium/keda-admission-webhooks:2.16.1-selenium-grid-20241225
1919
```
2020

2121
Besides that, you also can use image tag `latest` or `nightly`.
@@ -27,15 +27,15 @@ If you are deploying KEDA core using their official Helm [chart](https://github.
2727
keda:
2828
registry: selenium
2929
repository: keda
30-
tag: "2.16.0-selenium-grid-20241204"
30+
tag: "2.16.1-selenium-grid-20241225"
3131
metricsApiServer:
3232
registry: selenium
3333
repository: keda-metrics-apiserver
34-
tag: "2.16.0-selenium-grid-20241204"
34+
tag: "2.16.1-selenium-grid-20241225"
3535
webhooks:
3636
registry: selenium
3737
repository: keda-admission-webhooks
38-
tag: "2.16.0-selenium-grid-20241204"
38+
tag: "2.16.1-selenium-grid-20241225"
3939
```
4040
4141
If you are deployment Selenium Grid chart with `autoscaling.enabled` is `true` (implies installing KEDA sub-chart), KEDA images registry and tag already set in the `values.yaml`. Refer to list [configuration](../charts/selenium-grid/CONFIGURATION.md).

‎.keda/results_test_k8s_autoscaling_deployment_count.md‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
| Iteration | New request sessions | Sessions created time | Sessions failed to create | New pods scaled up | Total running sessions | Total running pods | Max sessions per pod | Gaps | Sessions closed |
22
| --------- | -------------------- | --------------------- | ------------------------- | ------------------ | ---------------------- | ------------------ | -------------------- | ---- | --------------- |
3-
| 1 | 1 | 28.57 s | 0 | 1 | 1 | 1 | 1 | 0 | 1 |
4-
| 2 | 1 | 5.10 s | 0 | 0 | 1 | 1 | 1 | 0 | 0 |
5-
| 3 | 3 | 63.16 s | 0 | 3 | 4 | 4 | 1 | 0 | 0 |
6-
| 4 | 1 | 35.54 s | 0 | 1 | 5 | 5 | 1 | 0 | 0 |
7-
| 5 | 2 | 38.30 s | 0 | 2 | 7 | 7 | 1 | 0 | 0 |
8-
| 6 | 1 | 44.21 s | 0 | 1 | 8 | 8 | 1 | 0 | 8 |
9-
| 7 | 1 | 4.78 s | 0 | 0 | 1 | 8 | 1 | 7 | 0 |
10-
| 8 | 2 | 40.11 s | 0 | 1 | 3 | 9 | 1 | 6 | 0 |
11-
| 9 | 1 | 4.33 s | 0 | 0 | 4 | 9 | 1 | 5 | 0 |
12-
| 10 | 1 | 40.46 s | 0 | 1 | 5 | 10 | 1 | 5 | 0 |
13-
| 11 | 2 | 29.67 s | 0 | 1 | 7 | 11 | 1 | 4 | 7 |
14-
| 12 | 2 | 12.27 s | 0 | 0 | 2 | 11 | 1 | 9 | 0 |
15-
| 13 | 3 | 13.77 s | 0 | 0 | 5 | 11 | 1 | 6 | 0 |
16-
| 14 | 2 | 6.81 s | 0 | 0 | 7 | 11 | 1 | 4 | 0 |
17-
| 15 | 2 | 38.89 s | 0 | 1 | 9 | 10 | 1 | 1 | 0 |
18-
| 16 | 1 | 36.10 s | 0 | 1 | 10 | 11 | 1 | 1 | 10 |
19-
| 17 | 2 | 6.82 s | 0 | 0 | 2 | 11 | 1 | 9 | 0 |
20-
| 18 | 1 | 4.88 s | 0 | 0 | 3 | 11 | 1 | 8 | 0 |
21-
| 19 | 1 | 6.67 s | 0 | 0 | 4 | 11 | 1 | 7 | 0 |
22-
| 20 | 2 | 6.87 s | 0 | 0 | 6 | 11 | 1 | 5 | 0 |
3+
| 1 | 3 | 62.04 s | 0 | 3 | 3 | 3 | 1 | 0 | 3 |
4+
| 2 | 1 | 4.45 s | 0 | 0 | 1 | 3 | 1 | 2 | 0 |
5+
| 3 | 3 | 38.93 s | 0 | 1 | 4 | 4 | 1 | 0 | 0 |
6+
| 4 | 2 | 37.83 s | 0 | 2 | 6 | 6 | 1 | 0 | 0 |
7+
| 5 | 2 | 44.99 s | 0 | 2 | 8 | 8 | 1 | 0 | 0 |
8+
| 6 | 2 | 45.18 s | 0 | 2 | 10 | 10 | 1 | 0 | 10 |
9+
| 7 | 3 | 13.41 s | 0 | 0 | 3 | 10 | 1 | 7 | 0 |
10+
| 8 | 3 | 40.59 s | 0 | 1 | 6 | 11 | 1 | 5 | 0 |
11+
| 9 | 3 | 30.72 s | 0 | 2 | 9 | 13 | 1 | 4 | 0 |
12+
| 10 | 3 | 30.72 s | 0 | 1 | 12 | 14 | 1 | 2 | 0 |
13+
| 11 | 1 | 28.62 s | 0 | 1 | 13 | 15 | 1 | 2 | 13 |
14+
| 12 | 1 | 12.40 s | 0 | 0 | 1 | 15 | 1 | 14 | 0 |
15+
| 13 | 3 | 8.21 s | 1 | -2 | 3 | 13 | 1 | 10 | 0 |
16+
| 14 | 1 | 6.61 s | 0 | 0 | 4 | 13 | 1 | 9 | 0 |
17+
| 15 | 3 | 39.79 s | 0 | 1 | 7 | 14 | 1 | 7 | 0 |
18+
| 16 | 2 | 6.33 s | 0 | 0 | 9 | 14 | 1 | 5 | 9 |
19+
| 17 | 1 | 12.49 s | 0 | 0 | 1 | 14 | 1 | 13 | 0 |
20+
| 18 | 2 | 13.79 s | 0 | 0 | 3 | 14 | 1 | 11 | 0 |
21+
| 19 | 1 | 6.73 s | 0 | 0 | 4 | 14 | 1 | 10 | 0 |
22+
| 20 | 2 | 37.25 s | 0 | -6 | 6 | 8 | 1 | 2 | 0 |

0 commit comments

Comments
 (0)