Skip to content

fix(devcontainer): replace flaky LLVM and kind features #2826

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

Draft
Quang Nguyen (nddq) wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(devcontainer): replace flaky LLVM and kind features #2826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 13 additions & 15 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2.16.1": {},
"ghcr.io/devcontainers/features/github-cli:1.1.0": {},
// Keep both versions equal to go.mod: "version" to the go directive
// (CI checks this), and "golangciLintVersion" to the golangci-lint tool,
// so that the editor lints like CI.
"ghcr.io/devcontainers/features/go:1.3.4": {
"version": "1.24.11"
"version": "1.26.0",
"golangciLintVersion": "2.11.4"
},
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1.3.1": {},
"ghcr.io/devcontainers-extra/features/kind:1.0.15": {},
"ghcr.io/devcontainers/features/azure-cli:1.2.9": {},
// LLVM 17 is the minimum version available for Ubuntu Noble on apt.llvm.org.
// Provides clang and llvm-strip needed for eBPF compilation.
"ghcr.io/devcontainers-community/features/llvm:3.2.0": {
"version": "17"
}
"ghcr.io/devcontainers/features/azure-cli:1.2.9": {}
},
"hostRequirements": {
"cpus": 4,
Expand All @@ -36,14 +34,14 @@
],
// These commands run in parallel during container creation.
"onCreateCommand": {
// The LLVM feature installs versioned binaries (clang-17, llvm-strip-17).
// Create unversioned symlinks so the build system can find them.
"symlinks": "sudo ln -sf /usr/bin/clang-17 /usr/bin/clang && sudo ln -sf /usr/bin/llvm-strip-17 /usr/bin/llvm-strip",
// Fix ownership of volume mounts (created as root) and cache dirs,
// then download Go modules.
"go-setup": "sudo chown -R vscode:vscode /go /home/vscode/.cache && go mod download",
// Install jq (needed by some Makefile targets and scripts).
"apt-deps": "sudo apt-get update && sudo apt-get install -y --no-install-recommends jq && sudo rm -rf /var/lib/apt/lists/*"
// download Go modules, then install kind at the version in go.mod.
"go-setup": "sudo chown -R vscode:vscode /go /home/vscode/.cache && go mod download && go install sigs.k8s.io/kind",
// Install jq (needed by some Makefile targets and scripts), and clang and
// llvm-strip (needed for eBPF compilation) from the Ubuntu archive.
// The LLVM packages install versioned binaries (clang-17, llvm-strip-17),
// so create unversioned symlinks that the build system can find.
"apt-deps": "sudo apt-get update && sudo apt-get install -y --no-install-recommends jq clang-17 llvm-17 && sudo ln -sf /usr/bin/clang-17 /usr/bin/clang && sudo ln -sf /usr/bin/llvm-strip-17 /usr/bin/llvm-strip && sudo rm -rf /var/lib/apt/lists/*"
},
// Wait for Docker-in-Docker to be ready, then create a Kind cluster for local testing.
"postStartCommand": {
Expand Down
6 changes: 6 additions & 0 deletions .github/dependabot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ updates:
cooldown:
default-days: 7
semver-major-days: 30
allow:
- dependency-type: "direct"
# go.mod marks tool dependencies as indirect, and Dependabot skips
# indirect dependencies unless an entry allows them by name.
- dependency-name: "sigs.k8s.io/kind"
dependency-type: "all"
ignore:
# hive/statedb/stream versions are pinned by cilium/cilium's go.mod;
# they can only move when cilium/cilium moves.
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/devcontainer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ jobs:
llvm-strip --version
go version
EXPECTED_GO=$(grep '^go ' go.mod | awk '{print $2}')
ACTUAL_GO=$(go version | grep -oP '\d+\.\d+\.\d+')
# GOTOOLCHAIN=local reports the installed Go. Without it, go
# downloads the go.mod version and the check always passes.
ACTUAL_GO=$(GOTOOLCHAIN=local go version | grep -oP '\d+\.\d+\.\d+')
if [ "$EXPECTED_GO" != "$ACTUAL_GO" ]; then
echo "::error::Go version mismatch: devcontainer has $ACTUAL_GO but go.mod requires $EXPECTED_GO"
exit 1
Expand Down
4 changes: 4 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ require (
require (
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
4d63.com/gochecknoglobals v0.2.2 // indirect
al.essio.dev/pkg/shellescape v1.5.1 // indirect
codeberg.org/chavacava/garif v0.2.0 // indirect
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
dario.cat/mergo v1.0.2 // indirect
Expand Down Expand Up @@ -433,6 +434,7 @@ require (
github.com/nxadm/tail v1.4.11 // indirect
github.com/oklog/ulid/v2 v2.1.1 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
Expand Down Expand Up @@ -510,6 +512,7 @@ require (
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250517180713-32e5e9e948a5 // indirect
sigs.k8s.io/controller-tools v0.20.1 // indirect
sigs.k8s.io/gateway-api v1.6.1 // indirect
sigs.k8s.io/kind v0.33.0 // indirect
sigs.k8s.io/mcs-api v0.5.2 // indirect
sigs.k8s.io/mcs-api/controllers v0.5.2 // indirect
sigs.k8s.io/network-policy-api v0.2.0 // indirect
Expand All @@ -526,6 +529,7 @@ tool (
mvdan.cc/gofumpt
sigs.k8s.io/controller-runtime/tools/setup-envtest
sigs.k8s.io/controller-tools/cmd/controller-gen
sigs.k8s.io/kind
)

replace k8s.io/perf-tests/network/benchmarks/netperf => github.com/Azure/perf-tests/network/benchmarks/netperf v0.0.0-20241008140716-395a79947d2c
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
4d63.com/gocheckcompilerdirectives v1.3.0/go.mod h1:ofsJ4zx2QAuIP/NO/NAh1ig6R1Fb18/GI7RVMwz7kAY=
4d63.com/gochecknoglobals v0.2.2 h1:H1vdnwnMaZdQW/N+NrkT1SZMTBmcwHe9Vq8lJcYYTtU=
4d63.com/gochecknoglobals v0.2.2/go.mod h1:lLxwTQjL5eIesRbvnzIP3jZtG140FnTdz+AlMa+ogt0=
al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho=
al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs=
cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
Expand Down Expand Up @@ -156,8 +158,6 @@ github.com/alecthomas/go-check-sumtype v0.3.1 h1:u9aUvbGINJxLVXiFvHUlPEaD7VDULsr
github.com/alecthomas/go-check-sumtype v0.3.1/go.mod h1:A8TSiN3UPRw3laIgWEUOHHLPa6/r9MtoigdlP5h3K/E=
github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=
github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
github.com/alexkohler/nakedret/v2 v2.0.6 h1:ME3Qef1/KIKr3kWX3nti3hhgNxw6aqN5pZmQiFSsuzQ=
github.com/alexkohler/nakedret/v2 v2.0.6/go.mod h1:l3RKju/IzOMQHmsEvXwkqMDzHHvurNQfAgE1eVmT40Q=
github.com/alexkohler/prealloc v1.1.0 h1:cKGRBqlXw5iyQGLYhrXrDlcHxugXpTq4tQ5c91wkf8M=
Expand Down Expand Up @@ -609,8 +609,8 @@ github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/renameio/v2 v2.0.2 h1:qKZs+tfn+arruZZhQ7TKC/ergJunuJicWS6gLDt/dGw=
github.com/google/renameio/v2 v2.0.2/go.mod h1:OX+G6WHHpHq3NVj7cAOleLOwJfcQ1s3uUJQCrr78SWo=
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 h1:SJ+NtwL6QaZ21U+IrK7d0gGgpjGGvd2kz+FzTHVzdqI=
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2/go.mod h1:Tv1PlzqC9t8wNnpPdctvtSUOPUUg4SHeE6vR1Ir2hmg=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
Expand Down Expand Up @@ -1474,8 +1474,8 @@ sigs.k8s.io/gateway-api v1.6.1 h1:mock6phZbI6rvZerwrVNk7hVNymQgHo+6sJ81Ia7ftY=
sigs.k8s.io/gateway-api v1.6.1/go.mod h1:FVfx3t389ybeXOqvDghLbdvJdSCfI/PReqCUI3lu3mY=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/kind v0.23.0 h1:8fyDGWbWTeCcCTwA04v4Nfr45KKxbSPH1WO9K+jVrBg=
sigs.k8s.io/kind v0.23.0/go.mod h1:ZQ1iZuJLh3T+O8fzhdi3VWcFTzsdXtNv2ppsHc8JQ7s=
sigs.k8s.io/kind v0.33.0 h1:AjvDv3vOygb/VKLVQW87lfktIBzkxR8Ump9DjxC8+Lk=
sigs.k8s.io/kind v0.33.0/go.mod h1:FSqriGaoTPruiXWfRnUXNykF8r2t+fHtK0P0m1AbGF8=
sigs.k8s.io/kustomize/api v0.21.1 h1:lzqbzvz2CSvsjIUZUBNFKtIMsEw7hVLJp0JeSIVmuJs=
sigs.k8s.io/kustomize/api v0.21.1/go.mod h1:f3wkKByTrgpgltLgySCntrYoq5d3q7aaxveSagwTlwI=
sigs.k8s.io/kustomize/kyaml v0.21.1 h1:IVlbmhC076nf6foyL6Taw4BkrLuEsXUXNpsE+ScX7fI=
Expand Down
Loading