From b1ac7296435eb417070a6b7c97fd28a0428c2262 Mon Sep 17 00:00:00 2001 From: yafengio Date: Wed, 23 Jul 2025 11:27:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style:=20=E2=9C=A8=20optimize=20import=20or?= =?UTF-8?q?der=20and=20more=20readable.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/bbr/health.go | 1 + cmd/epp/runner/health.go | 1 + conformance/conformance.go | 20 +++++++------------ .../basic/gateway_following_epp_routing.go | 2 +- .../inferencepool_invalid_epp_service.go | 2 +- conformance/utils/config/timing.go | 2 -- conformance/utils/kubernetes/helpers.go | 6 +++--- pkg/bbr/handlers/request.go | 1 + pkg/bbr/handlers/request_test.go | 1 + pkg/bbr/handlers/server.go | 1 + pkg/bbr/handlers/server_test.go | 1 + pkg/bbr/server/runserver.go | 1 + pkg/epp/backend/metrics/fake.go | 1 + pkg/epp/backend/metrics/logger.go | 1 + pkg/epp/backend/metrics/metrics.go | 1 + pkg/epp/backend/metrics/pod_metrics_test.go | 1 + pkg/epp/backend/metrics/types.go | 1 + .../controller/inferencemodel_reconciler.go | 1 + .../inferencemodel_reconciler_test.go | 1 + .../controller/inferencepool_reconciler.go | 1 + .../inferencepool_reconciler_test.go | 1 + pkg/epp/controller/pod_reconciler.go | 1 + pkg/epp/controller/pod_reconciler_test.go | 1 + pkg/epp/datastore/datastore.go | 1 + pkg/epp/datastore/datastore_test.go | 1 + .../interflow/dispatch/functional_test.go | 3 +-- .../intraflow/dispatch/functional_test.go | 1 - .../plugins/queue/functional_test.go | 6 +++--- .../queue/maxminheap/maxminheap_test.go | 1 + pkg/epp/handlers/request.go | 1 + pkg/epp/handlers/response.go | 1 + pkg/epp/handlers/response_test.go | 1 + pkg/epp/handlers/server.go | 1 + .../metrics/collectors/inference_pool_test.go | 1 + pkg/epp/metrics/metrics_test.go | 1 + pkg/epp/requestcontrol/director.go | 1 + pkg/epp/requestcontrol/director_test.go | 1 + pkg/epp/saturationdetector/config.go | 1 + .../saturationdetector/saturationdetector.go | 1 + .../saturationdetector_test.go | 1 + pkg/epp/scheduling/config/config.go | 1 + .../plugins/filter/decision_tree_filter.go | 1 + .../plugins/filter/low_queue_filter.go | 3 +-- .../framework/plugins/multi/prefix/indexer.go | 1 + .../framework/plugins/multi/prefix/plugin.go | 1 + .../plugins/multi/prefix/plugin_test.go | 1 + .../framework/plugins/scorer/kvcache_test.go | 1 + .../framework/plugins/scorer/queue_test.go | 1 + .../plugins/test/filter/filter_test.go | 1 + .../scheduling/framework/scheduler_profile.go | 1 + pkg/epp/scheduling/scheduler.go | 1 + pkg/epp/scheduling/scheduler_test.go | 1 + pkg/epp/server/controller_manager.go | 1 + pkg/epp/server/runserver.go | 1 + pkg/epp/server/server_test.go | 1 + pkg/epp/util/env/env_test.go | 1 + pkg/epp/util/testing/diff.go | 1 + pkg/epp/util/testing/wrappers.go | 1 + pkg/generator/main.go | 3 ++- test/e2e/epp/e2e_suite_test.go | 1 + test/e2e/epp/e2e_test.go | 1 + test/integration/bbr/hermetic_test.go | 1 + test/integration/util.go | 1 + test/utils/server.go | 1 + test/utils/utils.go | 1 + test/utils/wrappers.go | 1 + 66 files changed, 75 insertions(+), 29 deletions(-) diff --git a/cmd/bbr/health.go b/cmd/bbr/health.go index f42ca2b41..e1020b3ba 100644 --- a/cmd/bbr/health.go +++ b/cmd/bbr/health.go @@ -24,6 +24,7 @@ import ( "google.golang.org/grpc/codes" healthPb "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/status" + logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/cmd/epp/runner/health.go b/cmd/epp/runner/health.go index 283541e95..cc5da8d2f 100644 --- a/cmd/epp/runner/health.go +++ b/cmd/epp/runner/health.go @@ -24,6 +24,7 @@ import ( "google.golang.org/grpc/codes" healthPb "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/status" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/conformance/conformance.go b/conformance/conformance.go index ba2b96270..d8f461f88 100644 --- a/conformance/conformance.go +++ b/conformance/conformance.go @@ -30,17 +30,15 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + // Import runtime package for scheme creation + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" clientsetscheme "k8s.io/client-go/kubernetes/scheme" - - // Import runtime package for scheme creation - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" k8sconfig "sigs.k8s.io/controller-runtime/pkg/client/config" - // Import necessary types and utilities from the core Gateway API conformance suite. gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" // Import core Gateway API types // Report struct definition @@ -50,21 +48,17 @@ import ( "sigs.k8s.io/gateway-api/conformance/utils/tlog" "sigs.k8s.io/gateway-api/pkg/features" + // Import the Inference Extension API types + inferencev1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" + inferencev1alpha2 "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" // Import the test definitions package to access the ConformanceTests slice "sigs.k8s.io/gateway-api-inference-extension/conformance/tests" - "sigs.k8s.io/gateway-api-inference-extension/version" - // Import test packages using blank identifier // This triggers the init() functions in these packages, which register the tests // by appending them to the tests.ConformanceTests slice. _ "sigs.k8s.io/gateway-api-inference-extension/conformance/tests/basic" - // TODO: Add blank imports for other test categories as they are created. - // _ "sigs.k8s.io/gateway-api-inference-extension/conformance/tests/model_routing" - - // Import the Inference Extension API types - inferencev1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" - inferencev1alpha2 "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" inferenceconfig "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/config" + "sigs.k8s.io/gateway-api-inference-extension/version" ) const ( diff --git a/conformance/tests/basic/gateway_following_epp_routing.go b/conformance/tests/basic/gateway_following_epp_routing.go index 30a5a6f0b..83d0e2b5a 100644 --- a/conformance/tests/basic/gateway_following_epp_routing.go +++ b/conformance/tests/basic/gateway_following_epp_routing.go @@ -26,6 +26,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" "k8s.io/apimachinery/pkg/types" + gwhttp "sigs.k8s.io/gateway-api/conformance/utils/http" "sigs.k8s.io/gateway-api/conformance/utils/suite" "sigs.k8s.io/gateway-api/pkg/features" @@ -33,7 +34,6 @@ import ( k8sutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/kubernetes" "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/traffic" trafficutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/traffic" - gwhttp "sigs.k8s.io/gateway-api/conformance/utils/http" ) func init() { diff --git a/conformance/tests/basic/inferencepool_invalid_epp_service.go b/conformance/tests/basic/inferencepool_invalid_epp_service.go index e2a52d559..0fce85a60 100644 --- a/conformance/tests/basic/inferencepool_invalid_epp_service.go +++ b/conformance/tests/basic/inferencepool_invalid_epp_service.go @@ -21,12 +21,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - inferenceapi "sigs.k8s.io/gateway-api-inference-extension/api/v1" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/conformance/utils/kubernetes" "sigs.k8s.io/gateway-api/conformance/utils/suite" "sigs.k8s.io/gateway-api/pkg/features" + inferenceapi "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/conformance/tests" k8sutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/kubernetes" trafficutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/traffic" diff --git a/conformance/utils/config/timing.go b/conformance/utils/config/timing.go index 00aefdaa5..03cf0788f 100644 --- a/conformance/utils/config/timing.go +++ b/conformance/utils/config/timing.go @@ -19,8 +19,6 @@ package config import ( "time" - // Import the upstream Gateway API timeout config - gatewayconfig "sigs.k8s.io/gateway-api/conformance/utils/config" ) diff --git a/conformance/utils/kubernetes/helpers.go b/conformance/utils/kubernetes/helpers.go index 93866bfd5..888478807 100644 --- a/conformance/utils/kubernetes/helpers.go +++ b/conformance/utils/kubernetes/helpers.go @@ -33,12 +33,12 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - - inferenceapi "sigs.k8s.io/gateway-api-inference-extension/api/v1" - "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/config" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayapiconfig "sigs.k8s.io/gateway-api/conformance/utils/config" gatewayk8sutils "sigs.k8s.io/gateway-api/conformance/utils/kubernetes" + + inferenceapi "sigs.k8s.io/gateway-api-inference-extension/api/v1" + "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/config" ) // checkCondition is a helper function similar to findConditionInList or CheckCondition diff --git a/pkg/bbr/handlers/request.go b/pkg/bbr/handlers/request.go index 0a3b893fc..1145e6ecf 100644 --- a/pkg/bbr/handlers/request.go +++ b/pkg/bbr/handlers/request.go @@ -25,6 +25,7 @@ import ( eppb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3" extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/gateway-api-inference-extension/pkg/bbr/metrics" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/bbr/handlers/request_test.go b/pkg/bbr/handlers/request_test.go index 67c96de44..e59795353 100644 --- a/pkg/bbr/handlers/request_test.go +++ b/pkg/bbr/handlers/request_test.go @@ -28,6 +28,7 @@ import ( "google.golang.org/protobuf/testing/protocmp" metricsutils "k8s.io/component-base/metrics/testutil" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" + "sigs.k8s.io/gateway-api-inference-extension/pkg/bbr/metrics" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/bbr/handlers/server.go b/pkg/bbr/handlers/server.go index aca17ffad..ad93b3962 100644 --- a/pkg/bbr/handlers/server.go +++ b/pkg/bbr/handlers/server.go @@ -26,6 +26,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "sigs.k8s.io/controller-runtime/pkg/log" + logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" requtil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/request" ) diff --git a/pkg/bbr/handlers/server_test.go b/pkg/bbr/handlers/server_test.go index f4e8e2541..7bc50a697 100644 --- a/pkg/bbr/handlers/server_test.go +++ b/pkg/bbr/handlers/server_test.go @@ -25,6 +25,7 @@ import ( "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/testing/protocmp" "sigs.k8s.io/controller-runtime/pkg/log" + logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/bbr/server/runserver.go b/pkg/bbr/server/runserver.go index 2001b7ff0..ec2880b24 100644 --- a/pkg/bbr/server/runserver.go +++ b/pkg/bbr/server/runserver.go @@ -25,6 +25,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/gateway-api-inference-extension/internal/runnable" tlsutil "sigs.k8s.io/gateway-api-inference-extension/internal/tls" "sigs.k8s.io/gateway-api-inference-extension/pkg/bbr/handlers" diff --git a/pkg/epp/backend/metrics/fake.go b/pkg/epp/backend/metrics/fake.go index 68283187a..284a264cc 100644 --- a/pkg/epp/backend/metrics/fake.go +++ b/pkg/epp/backend/metrics/fake.go @@ -24,6 +24,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/epp/backend/metrics/logger.go b/pkg/epp/backend/metrics/logger.go index 259d6f182..8cd488098 100644 --- a/pkg/epp/backend/metrics/logger.go +++ b/pkg/epp/backend/metrics/logger.go @@ -23,6 +23,7 @@ import ( "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/log" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" diff --git a/pkg/epp/backend/metrics/metrics.go b/pkg/epp/backend/metrics/metrics.go index 6a50faab2..9f5366177 100644 --- a/pkg/epp/backend/metrics/metrics.go +++ b/pkg/epp/backend/metrics/metrics.go @@ -26,6 +26,7 @@ import ( dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" "go.uber.org/multierr" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" ) diff --git a/pkg/epp/backend/metrics/pod_metrics_test.go b/pkg/epp/backend/metrics/pod_metrics_test.go index 74aa7ce0e..f3d5cbc67 100644 --- a/pkg/epp/backend/metrics/pod_metrics_test.go +++ b/pkg/epp/backend/metrics/pod_metrics_test.go @@ -26,6 +26,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" ) diff --git a/pkg/epp/backend/metrics/types.go b/pkg/epp/backend/metrics/types.go index 80b708555..a760ff44f 100644 --- a/pkg/epp/backend/metrics/types.go +++ b/pkg/epp/backend/metrics/types.go @@ -24,6 +24,7 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" ) diff --git a/pkg/epp/controller/inferencemodel_reconciler.go b/pkg/epp/controller/inferencemodel_reconciler.go index 9ef87fd0e..cc06e5c72 100644 --- a/pkg/epp/controller/inferencemodel_reconciler.go +++ b/pkg/epp/controller/inferencemodel_reconciler.go @@ -28,6 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/predicate" + "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" diff --git a/pkg/epp/controller/inferencemodel_reconciler_test.go b/pkg/epp/controller/inferencemodel_reconciler_test.go index e826fa1f1..2df46d182 100644 --- a/pkg/epp/controller/inferencemodel_reconciler_test.go +++ b/pkg/epp/controller/inferencemodel_reconciler_test.go @@ -30,6 +30,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" diff --git a/pkg/epp/controller/inferencepool_reconciler.go b/pkg/epp/controller/inferencepool_reconciler.go index c983e5e03..783ef862d 100644 --- a/pkg/epp/controller/inferencepool_reconciler.go +++ b/pkg/epp/controller/inferencepool_reconciler.go @@ -24,6 +24,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" diff --git a/pkg/epp/controller/inferencepool_reconciler_test.go b/pkg/epp/controller/inferencepool_reconciler_test.go index eb5fa785b..1be41d1fa 100644 --- a/pkg/epp/controller/inferencepool_reconciler_test.go +++ b/pkg/epp/controller/inferencepool_reconciler_test.go @@ -30,6 +30,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" diff --git a/pkg/epp/controller/pod_reconciler.go b/pkg/epp/controller/pod_reconciler.go index bf8cb44e2..9972b3c1e 100644 --- a/pkg/epp/controller/pod_reconciler.go +++ b/pkg/epp/controller/pod_reconciler.go @@ -29,6 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/predicate" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" podutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/pod" diff --git a/pkg/epp/controller/pod_reconciler_test.go b/pkg/epp/controller/pod_reconciler_test.go index f078675c1..15a898b76 100644 --- a/pkg/epp/controller/pod_reconciler_test.go +++ b/pkg/epp/controller/pod_reconciler_test.go @@ -31,6 +31,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore" diff --git a/pkg/epp/datastore/datastore.go b/pkg/epp/datastore/datastore.go index c67647587..7275d6fff 100644 --- a/pkg/epp/datastore/datastore.go +++ b/pkg/epp/datastore/datastore.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" diff --git a/pkg/epp/datastore/datastore_test.go b/pkg/epp/datastore/datastore_test.go index fdb1a5afc..b2ba5d14f 100644 --- a/pkg/epp/datastore/datastore_test.go +++ b/pkg/epp/datastore/datastore_test.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/types" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" diff --git a/pkg/epp/flowcontrol/framework/plugins/policies/interflow/dispatch/functional_test.go b/pkg/epp/flowcontrol/framework/plugins/policies/interflow/dispatch/functional_test.go index 77a325ae0..9dacc2ad9 100644 --- a/pkg/epp/flowcontrol/framework/plugins/policies/interflow/dispatch/functional_test.go +++ b/pkg/epp/flowcontrol/framework/plugins/policies/interflow/dispatch/functional_test.go @@ -25,10 +25,9 @@ import ( "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework" frameworkmocks "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/mocks" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/plugins/policies/interflow/dispatch" - "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/types" - _ "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/plugins/policies/interflow/dispatch/besthead" _ "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/plugins/policies/interflow/dispatch/roundrobin" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/types" ) // TestInterFlowDispatchPolicy_Conformance is the main conformance test suite for `framework.InterFlowDispatchPolicy` diff --git a/pkg/epp/flowcontrol/framework/plugins/policies/intraflow/dispatch/functional_test.go b/pkg/epp/flowcontrol/framework/plugins/policies/intraflow/dispatch/functional_test.go index 5a78d3ed5..01e8a1c8e 100644 --- a/pkg/epp/flowcontrol/framework/plugins/policies/intraflow/dispatch/functional_test.go +++ b/pkg/epp/flowcontrol/framework/plugins/policies/intraflow/dispatch/functional_test.go @@ -25,7 +25,6 @@ import ( "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework" frameworkmocks "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/mocks" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/plugins/policies/intraflow/dispatch" - _ "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/plugins/policies/intraflow/dispatch/fcfs" ) diff --git a/pkg/epp/flowcontrol/framework/plugins/queue/functional_test.go b/pkg/epp/flowcontrol/framework/plugins/queue/functional_test.go index 7e33961e8..fe0105313 100644 --- a/pkg/epp/flowcontrol/framework/plugins/queue/functional_test.go +++ b/pkg/epp/flowcontrol/framework/plugins/queue/functional_test.go @@ -27,14 +27,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework" frameworkmocks "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/mocks" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/plugins/queue" - "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/types" - typesmocks "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/types/mocks" - _ "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/plugins/queue/listqueue" _ "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/plugins/queue/maxminheap" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/types" + typesmocks "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/types/mocks" ) // enqueueTimeComparator orders items by their enqueue time (earlier first). diff --git a/pkg/epp/flowcontrol/framework/plugins/queue/maxminheap/maxminheap_test.go b/pkg/epp/flowcontrol/framework/plugins/queue/maxminheap/maxminheap_test.go index 165d48f55..39e82fb5d 100644 --- a/pkg/epp/flowcontrol/framework/plugins/queue/maxminheap/maxminheap_test.go +++ b/pkg/epp/flowcontrol/framework/plugins/queue/maxminheap/maxminheap_test.go @@ -22,6 +22,7 @@ import ( "time" "github.com/stretchr/testify/require" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/framework/mocks" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/types" typesmocks "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/types/mocks" diff --git a/pkg/epp/handlers/request.go b/pkg/epp/handlers/request.go index ab93e023a..5789b3cc9 100644 --- a/pkg/epp/handlers/request.go +++ b/pkg/epp/handlers/request.go @@ -24,6 +24,7 @@ import ( configPb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3" "google.golang.org/protobuf/types/known/structpb" + errutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/error" ) diff --git a/pkg/epp/handlers/response.go b/pkg/epp/handlers/response.go index a776bd1d9..47c0b9d74 100644 --- a/pkg/epp/handlers/response.go +++ b/pkg/epp/handlers/response.go @@ -24,6 +24,7 @@ import ( configPb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/epp/handlers/response_test.go b/pkg/epp/handlers/response_test.go index b79f4ee46..6eb7734e4 100644 --- a/pkg/epp/handlers/response_test.go +++ b/pkg/epp/handlers/response_test.go @@ -22,6 +22,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" + logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/epp/handlers/server.go b/pkg/epp/handlers/server.go index d4a5ade0a..b8e6f525f 100644 --- a/pkg/epp/handlers/server.go +++ b/pkg/epp/handlers/server.go @@ -29,6 +29,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "sigs.k8s.io/controller-runtime/pkg/log" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics" diff --git a/pkg/epp/metrics/collectors/inference_pool_test.go b/pkg/epp/metrics/collectors/inference_pool_test.go index e5befd0f4..e855c55c1 100644 --- a/pkg/epp/metrics/collectors/inference_pool_test.go +++ b/pkg/epp/metrics/collectors/inference_pool_test.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/component-base/metrics/testutil" "sigs.k8s.io/controller-runtime/pkg/client/fake" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore" diff --git a/pkg/epp/metrics/metrics_test.go b/pkg/epp/metrics/metrics_test.go index 5dd97055d..d2e209bd1 100644 --- a/pkg/epp/metrics/metrics_test.go +++ b/pkg/epp/metrics/metrics_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/component-base/metrics/testutil" "sigs.k8s.io/controller-runtime/pkg/metrics" + errutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/error" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/epp/requestcontrol/director.go b/pkg/epp/requestcontrol/director.go index 2ad28b860..39337d41f 100644 --- a/pkg/epp/requestcontrol/director.go +++ b/pkg/epp/requestcontrol/director.go @@ -29,6 +29,7 @@ import ( "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" diff --git a/pkg/epp/requestcontrol/director_test.go b/pkg/epp/requestcontrol/director_test.go index 205049112..814af12af 100644 --- a/pkg/epp/requestcontrol/director_test.go +++ b/pkg/epp/requestcontrol/director_test.go @@ -32,6 +32,7 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" diff --git a/pkg/epp/saturationdetector/config.go b/pkg/epp/saturationdetector/config.go index 78a5833e4..54cd21c6c 100644 --- a/pkg/epp/saturationdetector/config.go +++ b/pkg/epp/saturationdetector/config.go @@ -20,6 +20,7 @@ import ( "time" "sigs.k8s.io/controller-runtime/pkg/log" + commonconfig "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/common/config" envutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/env" ) diff --git a/pkg/epp/saturationdetector/saturationdetector.go b/pkg/epp/saturationdetector/saturationdetector.go index 6ac0881e7..59a264835 100644 --- a/pkg/epp/saturationdetector/saturationdetector.go +++ b/pkg/epp/saturationdetector/saturationdetector.go @@ -36,6 +36,7 @@ import ( "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/log" + backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/epp/saturationdetector/saturationdetector_test.go b/pkg/epp/saturationdetector/saturationdetector_test.go index 42e81b5fd..5ec07347a 100644 --- a/pkg/epp/saturationdetector/saturationdetector_test.go +++ b/pkg/epp/saturationdetector/saturationdetector_test.go @@ -26,6 +26,7 @@ import ( "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" ) diff --git a/pkg/epp/scheduling/config/config.go b/pkg/epp/scheduling/config/config.go index e7fd0a3f4..a96184dd9 100644 --- a/pkg/epp/scheduling/config/config.go +++ b/pkg/epp/scheduling/config/config.go @@ -18,6 +18,7 @@ package config import ( "sigs.k8s.io/controller-runtime/pkg/log" + commonconfig "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/common/config" envutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/env" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" diff --git a/pkg/epp/scheduling/framework/plugins/filter/decision_tree_filter.go b/pkg/epp/scheduling/framework/plugins/filter/decision_tree_filter.go index a9a0a7c79..df3923144 100644 --- a/pkg/epp/scheduling/framework/plugins/filter/decision_tree_filter.go +++ b/pkg/epp/scheduling/framework/plugins/filter/decision_tree_filter.go @@ -23,6 +23,7 @@ import ( "fmt" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/plugins" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/framework" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/types" diff --git a/pkg/epp/scheduling/framework/plugins/filter/low_queue_filter.go b/pkg/epp/scheduling/framework/plugins/filter/low_queue_filter.go index 597c2a154..e3d4de9f1 100644 --- a/pkg/epp/scheduling/framework/plugins/filter/low_queue_filter.go +++ b/pkg/epp/scheduling/framework/plugins/filter/low_queue_filter.go @@ -18,9 +18,8 @@ package filter import ( "context" - "fmt" - "encoding/json" + "fmt" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/plugins" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/config" diff --git a/pkg/epp/scheduling/framework/plugins/multi/prefix/indexer.go b/pkg/epp/scheduling/framework/plugins/multi/prefix/indexer.go index 1b75f0fd4..0a209a8d4 100644 --- a/pkg/epp/scheduling/framework/plugins/multi/prefix/indexer.go +++ b/pkg/epp/scheduling/framework/plugins/multi/prefix/indexer.go @@ -23,6 +23,7 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin.go b/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin.go index 42e630354..64c23bf92 100644 --- a/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin.go +++ b/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin.go @@ -25,6 +25,7 @@ import ( "github.com/cespare/xxhash/v2" k8stypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/plugins" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/framework" diff --git a/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin_test.go b/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin_test.go index 27e13d685..aaf68f0d8 100644 --- a/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin_test.go +++ b/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin_test.go @@ -26,6 +26,7 @@ import ( "github.com/stretchr/testify/assert" k8stypes "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/types" ) diff --git a/pkg/epp/scheduling/framework/plugins/scorer/kvcache_test.go b/pkg/epp/scheduling/framework/plugins/scorer/kvcache_test.go index c0eeb5210..81f6d0ae6 100644 --- a/pkg/epp/scheduling/framework/plugins/scorer/kvcache_test.go +++ b/pkg/epp/scheduling/framework/plugins/scorer/kvcache_test.go @@ -21,6 +21,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/types" diff --git a/pkg/epp/scheduling/framework/plugins/scorer/queue_test.go b/pkg/epp/scheduling/framework/plugins/scorer/queue_test.go index a9a8115b3..ce8193679 100644 --- a/pkg/epp/scheduling/framework/plugins/scorer/queue_test.go +++ b/pkg/epp/scheduling/framework/plugins/scorer/queue_test.go @@ -21,6 +21,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/types" diff --git a/pkg/epp/scheduling/framework/plugins/test/filter/filter_test.go b/pkg/epp/scheduling/framework/plugins/test/filter/filter_test.go index 1eb1291d8..28cfcdafe 100644 --- a/pkg/epp/scheduling/framework/plugins/test/filter/filter_test.go +++ b/pkg/epp/scheduling/framework/plugins/test/filter/filter_test.go @@ -21,6 +21,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/types" ) diff --git a/pkg/epp/scheduling/framework/scheduler_profile.go b/pkg/epp/scheduling/framework/scheduler_profile.go index c65d20156..0ca806d9d 100644 --- a/pkg/epp/scheduling/framework/scheduler_profile.go +++ b/pkg/epp/scheduling/framework/scheduler_profile.go @@ -22,6 +22,7 @@ import ( "time" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/plugins" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/types" diff --git a/pkg/epp/scheduling/scheduler.go b/pkg/epp/scheduling/scheduler.go index 51e188d82..231b29e8f 100644 --- a/pkg/epp/scheduling/scheduler.go +++ b/pkg/epp/scheduling/scheduler.go @@ -23,6 +23,7 @@ import ( "time" "sigs.k8s.io/controller-runtime/pkg/log" + backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/framework" diff --git a/pkg/epp/scheduling/scheduler_test.go b/pkg/epp/scheduling/scheduler_test.go index 8923c3d6a..9e5d950db 100644 --- a/pkg/epp/scheduling/scheduler_test.go +++ b/pkg/epp/scheduling/scheduler_test.go @@ -23,6 +23,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/uuid" k8stypes "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" // Import config for thresholds "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/config" diff --git a/pkg/epp/server/controller_manager.go b/pkg/epp/server/controller_manager.go index 969c09839..7ab935e74 100644 --- a/pkg/epp/server/controller_manager.go +++ b/pkg/epp/server/controller_manager.go @@ -31,6 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" ) diff --git a/pkg/epp/server/runserver.go b/pkg/epp/server/runserver.go index de14a2da7..b0afb233f 100644 --- a/pkg/epp/server/runserver.go +++ b/pkg/epp/server/runserver.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/gateway-api-inference-extension/internal/runnable" tlsutil "sigs.k8s.io/gateway-api-inference-extension/internal/tls" backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" diff --git a/pkg/epp/server/server_test.go b/pkg/epp/server/server_test.go index c59152365..bcf0d0730 100644 --- a/pkg/epp/server/server_test.go +++ b/pkg/epp/server/server_test.go @@ -24,6 +24,7 @@ import ( pb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/handlers" diff --git a/pkg/epp/util/env/env_test.go b/pkg/epp/util/env/env_test.go index 4cf0223db..10b0b553e 100644 --- a/pkg/epp/util/env/env_test.go +++ b/pkg/epp/util/env/env_test.go @@ -6,6 +6,7 @@ import ( "time" "github.com/go-logr/logr/testr" + logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/pkg/epp/util/testing/diff.go b/pkg/epp/util/testing/diff.go index def3b148e..4acd4b9ae 100644 --- a/pkg/epp/util/testing/diff.go +++ b/pkg/epp/util/testing/diff.go @@ -19,6 +19,7 @@ package testing import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" ) diff --git a/pkg/epp/util/testing/wrappers.go b/pkg/epp/util/testing/wrappers.go index 3992916a9..24102dc19 100644 --- a/pkg/epp/util/testing/wrappers.go +++ b/pkg/epp/util/testing/wrappers.go @@ -19,6 +19,7 @@ package testing import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" ) diff --git a/pkg/generator/main.go b/pkg/generator/main.go index 6ca70ed11..641cc127b 100644 --- a/pkg/generator/main.go +++ b/pkg/generator/main.go @@ -25,8 +25,9 @@ import ( "sigs.k8s.io/controller-tools/pkg/crd" "sigs.k8s.io/controller-tools/pkg/loader" "sigs.k8s.io/controller-tools/pkg/markers" - "sigs.k8s.io/gateway-api-inference-extension/version" "sigs.k8s.io/yaml" + + "sigs.k8s.io/gateway-api-inference-extension/version" ) // This generation code is largely copied from diff --git a/test/e2e/epp/e2e_suite_test.go b/test/e2e/epp/e2e_suite_test.go index d0da4ac34..e4ca60475 100644 --- a/test/e2e/epp/e2e_suite_test.go +++ b/test/e2e/epp/e2e_suite_test.go @@ -40,6 +40,7 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" + infextv1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" infextv1a2 "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" testutils "sigs.k8s.io/gateway-api-inference-extension/test/utils" diff --git a/test/e2e/epp/e2e_test.go b/test/e2e/epp/e2e_test.go index 91aa74ecf..ec55828e7 100644 --- a/test/e2e/epp/e2e_test.go +++ b/test/e2e/epp/e2e_test.go @@ -33,6 +33,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" testutils "sigs.k8s.io/gateway-api-inference-extension/test/utils" ) diff --git a/test/integration/bbr/hermetic_test.go b/test/integration/bbr/hermetic_test.go index 8fd479fe3..69654bec9 100644 --- a/test/integration/bbr/hermetic_test.go +++ b/test/integration/bbr/hermetic_test.go @@ -29,6 +29,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/testing/protocmp" + runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/bbr/server" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" integrationutils "sigs.k8s.io/gateway-api-inference-extension/test/integration" diff --git a/test/integration/util.go b/test/integration/util.go index 925107bf8..996086e67 100644 --- a/test/integration/util.go +++ b/test/integration/util.go @@ -28,6 +28,7 @@ import ( envoyTypePb "github.com/envoyproxy/go-control-plane/envoy/type/v3" "github.com/go-logr/logr" "google.golang.org/protobuf/types/known/structpb" + "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/server" logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging" ) diff --git a/test/utils/server.go b/test/utils/server.go index 090d2bc5a..e83ef6018 100644 --- a/test/utils/server.go +++ b/test/utils/server.go @@ -32,6 +32,7 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics" diff --git a/test/utils/utils.go b/test/utils/utils.go index e814a31ed..71293f038 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -36,6 +36,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" "sigs.k8s.io/controller-runtime/pkg/client" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" ) diff --git a/test/utils/wrappers.go b/test/utils/wrappers.go index 0ad385d93..ca0b1cb26 100644 --- a/test/utils/wrappers.go +++ b/test/utils/wrappers.go @@ -19,6 +19,7 @@ package utils import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" ) From 51b8aab4f7a3fa8840f77290f5f6f1e983491c43 Mon Sep 17 00:00:00 2001 From: yafengio Date: Wed, 23 Jul 2025 12:47:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20goimports=20check=20f?= =?UTF-8?q?ailed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conformance/conformance.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conformance/conformance.go b/conformance/conformance.go index d8f461f88..97ce63eb2 100644 --- a/conformance/conformance.go +++ b/conformance/conformance.go @@ -30,6 +30,7 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + // Import runtime package for scheme creation "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -39,6 +40,7 @@ import ( clientsetscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" k8sconfig "sigs.k8s.io/controller-runtime/pkg/client/config" + // Import necessary types and utilities from the core Gateway API conformance suite. gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" // Import core Gateway API types // Report struct definition @@ -51,6 +53,7 @@ import ( // Import the Inference Extension API types inferencev1 "sigs.k8s.io/gateway-api-inference-extension/api/v1" inferencev1alpha2 "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2" + // Import the test definitions package to access the ConformanceTests slice "sigs.k8s.io/gateway-api-inference-extension/conformance/tests" // Import test packages using blank identifier