Skip to content

Commit 1a2d1a1

Browse files
tchaptchap
committed
Rename pkg/ext-proc to pkg/epp
1 parent 9f34673 commit 1a2d1a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+81
-80
lines changed

‎Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG BUILDER_IMAGE=golang:1.23-alpine
44
ARG BASE_IMAGE=gcr.io/distroless/base-debian10
55

66
## Multistage build
7-
FROM ${BUILDER_IMAGE} as builder
7+
FROM ${BUILDER_IMAGE} AS builder
88
ENV CGO_ENABLED=0
99
ENV GOOS=linux
1010
ENV GOARCH=amd64
@@ -19,13 +19,13 @@ COPY cmd ./cmd
1919
COPY pkg ./pkg
2020
COPY internal ./internal
2121
COPY api ./api
22-
WORKDIR /src/cmd/ext-proc
23-
RUN go build -o /ext-proc
22+
WORKDIR /src/cmd/epp
23+
RUN go build -o /epp
2424

2525
## Multistage deploy
2626
FROM ${BASE_IMAGE}
2727

2828
WORKDIR /
29-
COPY --from=builder /ext-proc /ext-proc
29+
COPY --from=builder /epp /epp
3030

31-
ENTRYPOINT ["/ext-proc"]
31+
ENTRYPOINT ["/epp"]

‎cmd/ext-proc/health.go ‎cmd/epp/health.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"google.golang.org/grpc/codes"
2424
healthPb "google.golang.org/grpc/health/grpc_health_v1"
2525
"google.golang.org/grpc/status"
26-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
27-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
26+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
27+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2828
)
2929

3030
type healthServer struct {

‎cmd/ext-proc/main.go ‎cmd/epp/main.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ import (
4141
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
4242
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
4343
"sigs.k8s.io/gateway-api-inference-extension/internal/runnable"
44-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/backend"
45-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/backend/vllm"
46-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
47-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/metrics"
48-
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/server"
49-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
44+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend"
45+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/vllm"
46+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
47+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics"
48+
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/server"
49+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
5050
)
5151

5252
const (

‎docs/dev.md

+1-1

‎docs/proposals/003-endpoint-picker-protocol/README.md

+1-1

‎pkg/ext-proc/backend/fake.go ‎pkg/epp/backend/fake.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"k8s.io/apimachinery/pkg/types"
2323
"sigs.k8s.io/controller-runtime/pkg/log"
2424
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
25-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
26-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
25+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
26+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2727
)
2828

2929
type FakePodMetricsClient struct {

‎pkg/ext-proc/backend/provider.go ‎pkg/epp/backend/provider.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"github.com/go-logr/logr"
2626
"go.uber.org/multierr"
2727
"sigs.k8s.io/controller-runtime/pkg/log"
28-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
29-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/metrics"
30-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
28+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
29+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics"
30+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3131
)
3232

3333
const (

‎pkg/ext-proc/backend/provider_test.go ‎pkg/epp/backend/provider_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/google/go-cmp/cmp/cmpopts"
2828
"github.com/stretchr/testify/assert"
2929
"k8s.io/apimachinery/pkg/types"
30-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
30+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
3131
)
3232

3333
var (

‎pkg/ext-proc/backend/vllm/metrics.go ‎pkg/epp/backend/vllm/metrics.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"github.com/prometheus/common/expfmt"
3131
"go.uber.org/multierr"
3232
"sigs.k8s.io/controller-runtime/pkg/log"
33-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
34-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
33+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
34+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3535
)
3636

3737
const (

‎pkg/ext-proc/backend/vllm/metrics_test.go ‎pkg/epp/backend/vllm/metrics_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
dto "github.com/prometheus/client_model/go"
2424
"github.com/stretchr/testify/assert"
2525
"google.golang.org/protobuf/proto"
26-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
27-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
26+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
27+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2828
)
2929

3030
func TestPromToPodMetrics(t *testing.T) {

‎pkg/ext-proc/controller/inferencemodel_reconciler.go ‎pkg/epp/controller/inferencemodel_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/log"
3030
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
31-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
32-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
31+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
32+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3333
)
3434

3535
type InferenceModelReconciler struct {

‎pkg/ext-proc/controller/inferencemodel_reconciler_test.go ‎pkg/epp/controller/inferencemodel_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/types"
3131
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
32-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
33-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
32+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
33+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3434
)
3535

3636
var (

‎pkg/ext-proc/controller/inferencepool_reconciler.go ‎pkg/epp/controller/inferencepool_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/log"
3030
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
31-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
32-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
31+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
32+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3333
)
3434

3535
// InferencePoolReconciler utilizes the controller runtime to reconcile Instance Gateway resources

‎pkg/ext-proc/controller/inferencepool_reconciler_test.go ‎pkg/epp/controller/inferencepool_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/client"
3232
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3333
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
34-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
35-
utiltesting "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/testing"
34+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
35+
utiltesting "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/testing"
3636
)
3737

3838
var (

‎pkg/ext-proc/controller/pod_reconciler.go ‎pkg/epp/controller/pod_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
ctrl "sigs.k8s.io/controller-runtime"
2929
"sigs.k8s.io/controller-runtime/pkg/client"
3030
"sigs.k8s.io/controller-runtime/pkg/log"
31-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
32-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
31+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
32+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3333
)
3434

3535
type PodReconciler struct {

‎pkg/ext-proc/controller/pod_reconciler_test.go ‎pkg/epp/controller/pod_reconciler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/client"
3333
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3434
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
35-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
35+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
3636
)
3737

3838
var (

‎pkg/ext-proc/datastore/datastore.go ‎pkg/epp/datastore/datastore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/client"
3030
"sigs.k8s.io/controller-runtime/pkg/log"
3131
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
32-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
32+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3333
)
3434

3535
// The datastore is a local cache of relevant data for the given InferencePool (currently all pulled from k8s-api)

‎pkg/ext-proc/datastore/datastore_test.go ‎pkg/epp/datastore/datastore_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
24-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
24+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2525
)
2626

2727
func TestHasSynced(t *testing.T) {

‎pkg/ext-proc/datastore/types.go ‎pkg/epp/datastore/types.go

File renamed without changes.

‎pkg/ext-proc/handlers/request.go ‎pkg/epp/handlers/request.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
2828
"google.golang.org/protobuf/types/known/structpb"
2929
"sigs.k8s.io/controller-runtime/pkg/log"
30-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
31-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/scheduling"
32-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
30+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
31+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling"
32+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3333
)
3434

3535
// HandleRequestBody handles body of the request to the backend server, such as parsing the "model"

‎pkg/ext-proc/handlers/response.go ‎pkg/epp/handlers/response.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
configPb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
2525
extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
2626
"sigs.k8s.io/controller-runtime/pkg/log"
27-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
27+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2828
)
2929

3030
// HandleResponseHeaders processes response headers from the backend model server.

‎pkg/ext-proc/handlers/response_test.go ‎pkg/epp/handlers/response_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
2424
"github.com/google/go-cmp/cmp"
25-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
25+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2626
)
2727

2828
const (

‎pkg/ext-proc/handlers/server.go ‎pkg/epp/handlers/server.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"google.golang.org/grpc/codes"
2828
"google.golang.org/grpc/status"
2929
"sigs.k8s.io/controller-runtime/pkg/log"
30-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
31-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/metrics"
32-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/scheduling"
33-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
30+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
31+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics"
32+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling"
33+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3434
)
3535

3636
func NewServer(scheduler Scheduler, targetEndpointKey string, datastore datastore.Datastore) *Server {

‎pkg/ext-proc/metrics/README.md ‎pkg/epp/metrics/README.md

‎pkg/ext-proc/metrics/metrics.go ‎pkg/epp/metrics/metrics.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
compbasemetrics "k8s.io/component-base/metrics"
2525
"k8s.io/component-base/metrics/legacyregistry"
2626
"sigs.k8s.io/controller-runtime/pkg/log"
27-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
27+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2828
)
2929

3030
const (

‎pkg/ext-proc/metrics/metrics_test.go ‎pkg/epp/metrics/metrics_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"k8s.io/component-base/metrics/legacyregistry"
2626
"k8s.io/component-base/metrics/testutil"
27-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
27+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2828
)
2929

3030
const (

‎pkg/ext-proc/metrics/testdata/input_tokens_metric ‎pkg/epp/metrics/testdata/input_tokens_metric

File renamed without changes.

‎pkg/ext-proc/metrics/testdata/kv_cache_avg_metrics ‎pkg/epp/metrics/testdata/kv_cache_avg_metrics

File renamed without changes.

‎pkg/ext-proc/metrics/testdata/output_tokens_metric ‎pkg/epp/metrics/testdata/output_tokens_metric

File renamed without changes.

‎pkg/ext-proc/metrics/testdata/queue_avg_size_metrics ‎pkg/epp/metrics/testdata/queue_avg_size_metrics

File renamed without changes.

‎pkg/ext-proc/metrics/testdata/request_duration_seconds_metric ‎pkg/epp/metrics/testdata/request_duration_seconds_metric

File renamed without changes.

‎pkg/ext-proc/metrics/testdata/request_sizes_metric ‎pkg/epp/metrics/testdata/request_sizes_metric

File renamed without changes.

‎pkg/ext-proc/metrics/testdata/request_total_metric ‎pkg/epp/metrics/testdata/request_total_metric

File renamed without changes.

‎pkg/ext-proc/metrics/testdata/response_sizes_metric ‎pkg/epp/metrics/testdata/response_sizes_metric

File renamed without changes.

‎pkg/ext-proc/scheduling/filter.go ‎pkg/epp/scheduling/filter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"math"
2222

2323
"github.com/go-logr/logr"
24-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
25-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
24+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
25+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2626
)
2727

2828
type Filter interface {

‎pkg/ext-proc/scheduling/filter_test.go ‎pkg/epp/scheduling/filter_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/go-logr/logr"
2424
"github.com/google/go-cmp/cmp"
2525
"k8s.io/apimachinery/pkg/types"
26-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
27-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
26+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
27+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2828
)
2929

3030
func TestFilter(t *testing.T) {

‎pkg/ext-proc/scheduling/scheduler.go ‎pkg/epp/scheduling/scheduler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"google.golang.org/grpc/codes"
2727
"google.golang.org/grpc/status"
2828
"sigs.k8s.io/controller-runtime/pkg/log"
29-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
30-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
29+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
30+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3131
)
3232

3333
const (

‎pkg/ext-proc/scheduling/types.go ‎pkg/epp/scheduling/types.go

File renamed without changes.

‎pkg/ext-proc/server/runserver.go ‎pkg/epp/server/runserver.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import (
3636
ctrl "sigs.k8s.io/controller-runtime"
3737
"sigs.k8s.io/controller-runtime/pkg/manager"
3838
"sigs.k8s.io/gateway-api-inference-extension/internal/runnable"
39-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/backend"
40-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/controller"
41-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
42-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/handlers"
43-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/scheduling"
39+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend"
40+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/controller"
41+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
42+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/handlers"
43+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling"
4444
)
4545

4646
// ExtProcServerRunner provides methods to manage an external process server.

‎pkg/ext-proc/server/runserver_test.go ‎pkg/epp/server/runserver_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
"sigs.k8s.io/controller-runtime/pkg/manager"
2323

24-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/server"
25-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
24+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/server"
25+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2626
)
2727

2828
func TestRunnable(t *testing.T) {

‎pkg/ext-proc/test/benchmark/benchmark.go ‎pkg/epp/test/benchmark/benchmark.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/log"
3333
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3434
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
35-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
36-
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/server"
37-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/test"
38-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
35+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
36+
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/server"
37+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/test"
38+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3939
)
4040

4141
var (

‎pkg/ext-proc/test/utils.go ‎pkg/epp/test/utils.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ import (
3030
"k8s.io/apimachinery/pkg/types"
3131
"sigs.k8s.io/controller-runtime/pkg/log"
3232
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
33-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/backend"
34-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
35-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/handlers"
36-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/scheduling"
37-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
38-
utiltesting "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/testing"
33+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend"
34+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
35+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/handlers"
36+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling"
37+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
38+
utiltesting "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/testing"
3939
)
4040

4141
func StartExtProc(

‎pkg/ext-proc/util/logging/fatal.go ‎pkg/epp/util/logging/fatal.go

File renamed without changes.

‎pkg/ext-proc/util/logging/logger.go ‎pkg/epp/util/logging/logger.go

File renamed without changes.

‎pkg/ext-proc/util/logging/logging_const.go ‎pkg/epp/util/logging/logging_const.go

File renamed without changes.

‎pkg/ext-proc/util/testing/wrappers.go ‎pkg/epp/util/testing/wrappers.go

File renamed without changes.

‎test/integration/hermetic_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ import (
4747
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
4848
"sigs.k8s.io/controller-runtime/pkg/envtest"
4949
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
50-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/backend"
51-
"sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/datastore"
52-
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/server"
53-
extprocutils "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/test"
54-
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/logging"
55-
utiltesting "sigs.k8s.io/gateway-api-inference-extension/pkg/ext-proc/util/testing"
50+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend"
51+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
52+
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/server"
53+
extprocutils "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/test"
54+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
55+
utiltesting "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/testing"
5656
"sigs.k8s.io/yaml"
5757
)
5858

0 commit comments

Comments
 (0)