Skip to content

Commit 58dca1f

Browse files
Merge branch 'main' into weiweng/release-2025-11-03
2 parents aee876d + 0b60f33 commit 58dca1f

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Check out code into the Go module directory
4343
uses: actions/checkout@v5
44-
44+
4545
- name: Set up Ginkgo CLI
4646
run: |
4747
go install github.com/onsi/ginkgo/v2/[email protected]
@@ -92,6 +92,25 @@ jobs:
9292
- name: Check out code into the Go module directory
9393
uses: actions/checkout@v5
9494

95+
- name: Move Docker data directory to /mnt
96+
# The default storage device on GitHub-hosted runners is running low during e2e tests.
97+
# Moving Docker data directory to /mnt which has more space and is backed by a larger
98+
# storage device.
99+
# Upstream kubefleet repo has a much bigger default storage device and no secondary
100+
# storage device to use.
101+
run: |
102+
echo "=== Moving Docker to /mnt for more disk space ==="
103+
df -h
104+
sudo systemctl stop docker
105+
echo '{"data-root": "/mnt/docker"}' | sudo tee /etc/docker/daemon.json
106+
sudo mkdir -p /mnt/docker
107+
if [ -d "/var/lib/docker" ]; then
108+
sudo mv /var/lib/docker/* /mnt/docker/ || true
109+
fi
110+
sudo systemctl start docker
111+
echo "=== Docker moved to /mnt, verifying ==="
112+
docker info | grep "Docker Root Dir" || true
113+
95114
- name: Install Ginkgo CLI
96115
run: |
97116
go install github.com/onsi/ginkgo/v2/[email protected]

docker/crd-installer.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the crdinstaller binary
2-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.6 AS builder
2+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.9 AS builder
33

44
ARG GOOS=linux
55
ARG GOARCH=amd64

0 commit comments

Comments
 (0)