Skip to content

[ci] Update deps version for env setup #2691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 4, 2025
Merged

[ci] Update deps version for env setup #2691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56bfa43
[ci] Update deps version for env setup
VietND96 Mar 3, 2025
ca8c0d3
Add default JAVA_OPTS
VietND96 Mar 4, 2025
db90923
Revert "Add default JAVA_OPTS"
VietND96 Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .ffmpeg/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM ubuntu:noble AS builder
ARG FFMPEG_VERSION="7.1"
ARG RCLONE_VER="v1.69.1"
ARG GO_VERSION="latest"
#ARG GO_CRYPTO_VERSION="v0.35.0"
#ARG GO_OAUTH2_VERSION="v0.27.0"
ARG GO_CRYPTO_VERSION="v0.35.0"
ARG GO_OAUTH2_VERSION="v0.27.0"

USER root

Expand Down Expand Up @@ -34,9 +34,9 @@ RUN cd /usr/local/src \
&& cd rclone \
&& git checkout ${RCLONE_VER} \
# Patch deps version in go.mod to fix CVEs
# && sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
# && sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
# && go mod tidy \
&& sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
&& sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
&& go mod tidy \
# Build rclone
&& make \
&& mv ~/go/bin/rclone /usr/local/bin/ \
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/helm-chart-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,38 +66,38 @@ jobs:
test-upgrade: true
service-mesh: true
os: ubuntu-24.04
- k8s-version: 'v1.29.14'
- k8s-version: 'v1.29.13'
test-strategy: job_https
cluster: 'minikube'
helm-version: 'v3.14.3'
docker-version: '26.1.4'
docker-version: '27.5.1'
python-version: '3.11'
test-upgrade: true
service-mesh: false
os: ubuntu-24.04
- k8s-version: 'v1.30.10'
- k8s-version: 'v1.30.9'
test-strategy: job_hostname
cluster: 'minikube'
helm-version: 'v3.15.4'
docker-version: '26.1.4'
docker-version: '27.5.1'
python-version: '3.12'
test-upgrade: true
service-mesh: false
os: ubuntu-24.04
- k8s-version: 'v1.31.6'
- k8s-version: 'v1.31.5'
test-strategy: deployment_https
cluster: 'minikube'
helm-version: 'v3.16.4'
docker-version: '27.4.1'
docker-version: '28.0.1'
python-version: '3.13'
test-upgrade: true
service-mesh: false
os: ubuntu-24.04
- k8s-version: 'v1.32.2'
- k8s-version: 'v1.32.1'
test-strategy: playwright_connect_grid
cluster: 'minikube'
helm-version: 'v3.17.0'
docker-version: '26.1.4'
docker-version: '28.0.1'
python-version: '3.10'
test-upgrade: true
service-mesh: true
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/k8s-scaling-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,41 +61,41 @@ jobs:
fail-fast: false
matrix:
include:
- k8s-version: 'v1.31.6'
- k8s-version: 'v1.31.5'
test-strategy: test_k8s_autoscaling_job_count_strategy_default_in_chaos
cluster: 'minikube'
helm-version: 'v3.16.4'
docker-version: '27.4.1'
docker-version: '28.0.1'
python-version: '3.13'
- k8s-version: 'v1.31.6'
- k8s-version: 'v1.31.5'
test-strategy: test_k8s_autoscaling_job_count_strategy_default_with_node_max_sessions
cluster: 'minikube'
helm-version: 'v3.16.4'
docker-version: '27.4.1'
docker-version: '28.0.1'
python-version: '3.13'
- k8s-version: 'v1.31.6'
- k8s-version: 'v1.31.5'
test-strategy: test_k8s_autoscaling_job_count_strategy_default
cluster: 'minikube'
helm-version: 'v3.16.4'
docker-version: '27.4.1'
docker-version: '28.0.1'
python-version: '3.13'
- k8s-version: 'v1.31.6'
- k8s-version: 'v1.31.5'
test-strategy: test_k8s_autoscaling_deployment_count_in_chaos
cluster: 'minikube'
helm-version: 'v3.16.4'
docker-version: '27.4.1'
docker-version: '28.0.1'
python-version: '3.13'
- k8s-version: 'v1.31.6'
- k8s-version: 'v1.31.5'
test-strategy: test_k8s_autoscaling_deployment_count_with_node_max_sessions
cluster: 'minikube'
helm-version: 'v3.16.4'
docker-version: '27.4.1'
docker-version: '28.0.1'
python-version: '3.13'
- k8s-version: 'v1.31.6'
- k8s-version: 'v1.31.5'
test-strategy: test_k8s_autoscaling_deployment_count
cluster: 'minikube'
helm-version: 'v3.16.4'
docker-version: '27.4.1'
docker-version: '28.0.1'
python-version: '3.13'
env:
CLUSTER: ${{ matrix.cluster }}
Expand Down
2 changes: 1 addition & 1 deletion tests/charts/make/chart_setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

Expand Down
Loading