Skip to content

Commit a428d31

Browse files
committed
build: uplift Go version to 1.25
- fix lint issues - update link Signed-off-by: Wen Zhou <wenzhou@redhat.com>
1 parent 362e0a5 commit a428d31

File tree

8 files changed

+14
-17
lines changed

8 files changed

+14
-17
lines changed

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Documentation for developing the inference scheduler.
55
## Requirements
66

77
- [Make] `v4`+
8-
- [Golang] `v1.24`+
8+
- [Golang] `v1.25`+
99
- [Docker] (or [Podman])
1010
- [Kubernetes in Docker (KIND)]
1111
- [Kustomize]

Dockerfile.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Minimal runtime Dockerfile (microdnf-only, no torch, wrapper in site-packages)
2-
# Build Stage: using Go 1.24 image
3-
FROM quay.io/projectquay/golang:1.24 AS builder
2+
# Build Stage: using Go 1.25 image
3+
FROM quay.io/projectquay/golang:1.25 AS builder
44

55
ARG TARGETOS
66
ARG TARGETARCH

Dockerfile.sidecar

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Build Stage: using Go 1.24 image
2-
FROM quay.io/projectquay/golang:1.24 AS builder
1+
# Build Stage: using Go 1.25 image
2+
FROM quay.io/projectquay/golang:1.25 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55
ARG COMMIT_SHA=unknown

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ check-ginkgo:
358358
.PHONY: check-golangci-lint
359359
check-golangci-lint:
360360
@command -v golangci-lint >/dev/null 2>&1 || { \
361-
echo "❌ golangci-lint is not installed. Install from https://golangci-lint.run/usage/install/"; exit 1; }
361+
echo "❌ golangci-lint is not installed. Install from https://golangci-lint.run/docs/welcome/install/"; exit 1; }
362362

363363
.PHONY: check-kustomize
364364
check-kustomize:

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/llm-d/llm-d-inference-scheduler
22

3-
go 1.24.1
4-
5-
toolchain go1.24.2
3+
go 1.25
64

75
require (
86
github.com/go-logr/logr v1.4.3

pkg/sidecar/proxy/data_parallel_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/llm-d/llm-d-inference-scheduler/pkg/common"
1515
sidecarmock "github.com/llm-d/llm-d-inference-scheduler/test/sidecar/mock"
16-
testutils "github.com/llm-d/llm-d-inference-scheduler/test/utils"
16+
"github.com/llm-d/llm-d-inference-scheduler/test/testnet"
1717
)
1818

1919
const (
@@ -30,7 +30,7 @@ var _ = Describe("Data Parallel support", func() {
3030
// proxy.startDataParallel starts listeners on the ports following
3131
// the proxy's main port. To avoid problems, get a free port and
3232
// tell the proxy that it is listening on that port minus one.
33-
freePort, err := testutils.GetFreePort()
33+
freePort, err := testnet.GetFreePort()
3434
Expect(err).ToNot(HaveOccurred())
3535
tmpPort, err := strconv.Atoi(freePort)
3636
fakeProxyPort := tmpPort - 1

test/e2e/e2e_suite_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,11 @@ func createInferencePool(numTargetPorts int, toDelete bool) []string {
271271
}
272272

273273
infPoolYaml := testutils.ReadYaml(inferExtManifest)
274-
targetPorts := ""
274+
var targetPortsBuilder strings.Builder
275275
for idx := range numTargetPorts {
276-
targetPorts += fmt.Sprintf("\n - number: %d", 8000+idx)
276+
targetPortsBuilder.WriteString(fmt.Sprintf("\n - number: %d", 8000+idx))
277277
}
278+
targetPorts := targetPortsBuilder.String()
278279
infPoolYaml = substituteMany(infPoolYaml,
279280
map[string]string{
280281
"${POOL_NAME}": poolName,

test/utils/network.go renamed to test/testnet/network.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// Package utils contains utilities for testing
2-
//
3-
//revive:disable:var-naming
4-
package utils
1+
// Package testnet contains network utilities for testing
2+
package testnet
53

64
//revive:enable:var-naming
75

0 commit comments

Comments
 (0)