Skip to content

Commit cab2472

Browse files
authored
Move pkg/ext-proc -> cmd/ext-proc (#368)
* Move pkg/ext-proc -> cmd/ext-proc * Rework Dockerfile - Cache dependencies - Upload only the files needed
1 parent c998e50 commit cab2472

File tree

7 files changed

+12
-5
lines changed

7 files changed

+12
-5
lines changed

Dockerfile

+9-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,17 @@ ENV CGO_ENABLED=0
99
ENV GOOS=linux
1010
ENV GOARCH=amd64
1111

12+
# Dependencies
1213
WORKDIR /src
13-
COPY . .
14-
WORKDIR /src/pkg/ext-proc
14+
COPY go.mod go.sum ./
1515
RUN go mod download
16+
17+
# Sources
18+
COPY cmd ./cmd
19+
COPY pkg ./pkg
20+
COPY internal ./internal
21+
COPY api ./api
22+
WORKDIR /src/cmd/ext-proc
1623
RUN go build -o /ext-proc
1724

1825
## Multistage deploy
File renamed without changes.

pkg/ext-proc/main.go cmd/ext-proc/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/manager"
2525
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
2626
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
27+
"sigs.k8s.io/gateway-api-inference-extension/internal/runnable"
2728
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/backend"
2829
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/backend/vllm"
2930
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
30-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/internal/runnable"
3131
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/metrics"
3232
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/server"
3333
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ require (
2727
k8s.io/client-go v0.32.2
2828
k8s.io/code-generator v0.32.2
2929
k8s.io/component-base v0.32.2
30-
k8s.io/klog/v2 v2.130.1
3130
k8s.io/utils v0.0.0-20241210054802-24370beab758
3231
sigs.k8s.io/controller-runtime v0.20.2
3332
sigs.k8s.io/structured-merge-diff/v4 v4.5.0
@@ -137,6 +136,7 @@ require (
137136
gopkg.in/yaml.v3 v3.0.1 // indirect
138137
k8s.io/apiserver v0.32.2 // indirect
139138
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
139+
k8s.io/klog/v2 v2.130.1 // indirect
140140
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
141141
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
142142
sigs.k8s.io/controller-tools v0.14.0 // indirect
File renamed without changes.

pkg/ext-proc/server/runserver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
"k8s.io/apimachinery/pkg/types"
2020
ctrl "sigs.k8s.io/controller-runtime"
2121
"sigs.k8s.io/controller-runtime/pkg/manager"
22+
"sigs.k8s.io/gateway-api-inference-extension/internal/runnable"
2223
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/backend"
2324
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/controller"
2425
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
2526
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/handlers"
26-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/internal/runnable"
2727
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/scheduling"
2828
)
2929

0 commit comments

Comments
 (0)