Skip to content

Commit b132c0b

Browse files
authored
Merge branch 'main' into fix-auto-inject-saturation-filter
2 parents 78a3e2e + e3995e3 commit b132c0b

8 files changed

Lines changed: 10 additions & 12 deletions

File tree

.github/workflows/nightly-router-perf-test-optimized-baseline-10k-1k.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,5 @@ jobs:
126126
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
127127
git add test/perf/results/optimized-baseline/
128128
git commit -m "Auto-update EPP nightly performance results [skip ci]" || exit 0
129+
git pull --rebase origin main
129130
git push

Dockerfile.builder

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM golang:1.25.12
1+
FROM golang:1.26.5
22

33
RUN mkdir /app
44
WORKDIR /app
55

66
ARG TYPOS_VERSION=v1.34.0
77
ARG KIND_VERSION=v0.27.0
8-
ARG GOLANGCI_LINT_VERSION=v2.8.0
8+
ARG GOLANGCI_LINT_VERSION=v2.10.0
99
ARG KUBECTL_VERSION=v1.35.3
1010
ARG KUSTOMIZE_VERSION=v5.6.0
1111
ARG DOCKER_VERSION=29.3.0

Dockerfile.coordinator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot
77

88
# Go build stage
9-
FROM --platform=${BUILDPLATFORM} quay.io/projectquay/golang:1.25 AS builder
9+
FROM --platform=${BUILDPLATFORM} golang:1.26.5 AS builder
1010

1111
ARG TARGETOS
1212
ARG TARGETARCH

Dockerfile.epp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot
77

88
# Go build stage
9-
FROM --platform=${BUILDPLATFORM} golang:1.25.12 AS go-builder
9+
FROM --platform=${BUILDPLATFORM} golang:1.26.5 AS go-builder
1010

1111
ARG TARGETOS
1212
ARG TARGETARCH

Dockerfile.sidecar

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# COPY --from=builder /etc/ssl/certs/ca-bundle.crt /etc/ssl/certs/ca-bundle.crt
66
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot
77

8-
# Build Stage: using Go 1.25.12 image
9-
FROM --platform=${BUILDPLATFORM} golang:1.25.12 AS builder
8+
# Build Stage: using Go 1.26.5 image
9+
FROM --platform=${BUILDPLATFORM} golang:1.26.5 AS builder
1010
ARG TARGETOS
1111
ARG TARGETARCH
1212

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/llm-d/llm-d-router
22

3-
go 1.25.12
3+
go 1.26.5
44

55
require (
66
cloud.google.com/go/aiplatform v1.124.0

pkg/epp/framework/plugins/requestcontrol/dataproducer/predictedlatency/running_request_tpot_slo_queue.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,7 @@ func (pq *requestPriorityQueue) String() string {
240240
if i > 0 {
241241
builder.WriteString(", ")
242242
}
243-
builder.WriteString(item.id)
244-
builder.WriteString("(")
245-
builder.WriteString(fmt.Sprintf("%.2f", item.tpot))
246-
builder.WriteString(")")
243+
fmt.Fprintf(&builder, "%s(%.2f)", item.id, item.tpot)
247244
}
248245

249246
builder.WriteString("]")

test/e2e/requests_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func runChatCompletionWithImages(imageURLs ...string) (string, string) {
208208
ginkgo.By(fmt.Sprintf("Sending Multimodal Chat Completion Request with %d images", len(imageURLs)))
209209
var sb strings.Builder
210210
for i, url := range imageURLs {
211-
sb.WriteString(fmt.Sprintf(`{"type":"image_url","image_url":{"url":%q},"uuid":"image-%d"},`, url, i))
211+
fmt.Fprintf(&sb, `{"type":"image_url","image_url":{"url":%q},"uuid":"image-%d"},`, url, i)
212212
}
213213
body := fmt.Sprintf(`{"model":%q,"messages":[{"role":"user","content":[%s{"type":"text","text":"Describe what you see."}]}],"max_tokens":150}`,
214214
simModelName, sb.String())

0 commit comments

Comments
 (0)