Skip to content

Commit d19b54f

Browse files
authored
[ci] Update deps version for env setup (#2691)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent d607e5c commit d19b54f

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

.ffmpeg/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM ubuntu:noble AS builder
22
ARG FFMPEG_VERSION="7.1"
33
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"
5+
ARG GO_CRYPTO_VERSION="v0.35.0"
6+
ARG GO_OAUTH2_VERSION="v0.27.0"
77

88
USER root
99

@@ -34,9 +34,9 @@ RUN cd /usr/local/src \
3434
&& cd rclone \
3535
&& git checkout ${RCLONE_VER} \
3636
# Patch deps version in go.mod to fix CVEs
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 \
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 \
4040
# Build rclone
4141
&& make \
4242
&& mv ~/go/bin/rclone /usr/local/bin/ \

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -66,38 +66,38 @@ jobs:
6666
test-upgrade: true
6767
service-mesh: true
6868
os: ubuntu-24.04
69-
- k8s-version: 'v1.29.14'
69+
- k8s-version: 'v1.29.13'
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
7777
os: ubuntu-24.04
78-
- k8s-version: 'v1.30.10'
78+
- k8s-version: 'v1.30.9'
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
8686
os: ubuntu-24.04
87-
- k8s-version: 'v1.31.6'
87+
- k8s-version: 'v1.31.5'
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
9595
os: ubuntu-24.04
96-
- k8s-version: 'v1.32.2'
96+
- k8s-version: 'v1.32.1'
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

+12-12
Original file line numberDiff line numberDiff line change
@@ -61,41 +61,41 @@ jobs:
6161
fail-fast: false
6262
matrix:
6363
include:
64-
- k8s-version: 'v1.31.6'
64+
- k8s-version: 'v1.31.5'
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'
70-
- k8s-version: 'v1.31.6'
70+
- 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'
76-
- k8s-version: 'v1.31.6'
76+
- 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'
82-
- k8s-version: 'v1.31.6'
82+
- 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'
88-
- k8s-version: 'v1.31.6'
88+
- 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'
94-
- k8s-version: 'v1.31.6'
94+
- 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 }}

tests/charts/make/chart_setup_env.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
echo "Set ENV variables"
44
CLUSTER=${CLUSTER:-"minikube"}
5-
DOCKER_VERSION=${DOCKER_VERSION:-""}
5+
DOCKER_VERSION=${DOCKER_VERSION:-"26.1.4"}
66
HELM_VERSION=${HELM_VERSION:-"latest"}
77
KUBERNETES_VERSION=${KUBERNETES_VERSION:-$(curl -L -s https://dl.k8s.io/release/stable.txt)}
88

0 commit comments

Comments
 (0)