Skip to content

Commit acb1f47

Browse files
committed
Update integration test
1 parent f057ffd commit acb1f47

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

Diff for: cmd/epp/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func run() error {
130130
return err
131131
}
132132

133-
mgr, err := runserver.NewDefaultManager(*poolNamespace, *poolName)
133+
mgr, err := runserver.NewDefaultManager(*poolNamespace, *poolName, cfg)
134134
if err != nil {
135135
setupLog.Error(err, "Failed to create controller manager")
136136
return err

Diff for: pkg/epp/server/controller_manager.go

+3-8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/runtime"
2525
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2626
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
27+
"k8s.io/client-go/rest"
2728
ctrl "sigs.k8s.io/controller-runtime"
2829
"sigs.k8s.io/controller-runtime/pkg/cache"
2930
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -38,14 +39,8 @@ func init() {
3839
}
3940

4041
// NewDefaultManager creates a new controller manager with default configuration.
41-
func NewDefaultManager(namespace, name string) (ctrl.Manager, error) {
42-
// Init runtime.
43-
cfg, err := ctrl.GetConfig()
44-
if err != nil {
45-
return nil, fmt.Errorf("failed to create rest config: %v", err)
46-
}
47-
48-
manager, err := ctrl.NewManager(cfg, ctrl.Options{
42+
func NewDefaultManager(namespace, name string, restConfig *rest.Config) (ctrl.Manager, error) {
43+
manager, err := ctrl.NewManager(restConfig, ctrl.Options{
4944
Scheme: scheme,
5045
Cache: cache.Options{
5146
ByObject: map[client.Object]cache.ByObject{

Diff for: test/integration/hermetic_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import (
5858
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend"
5959
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
6060
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics"
61+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/server"
6162
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/server"
6263
extprocutils "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/test"
6364
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
@@ -490,7 +491,8 @@ func BeforeSuit(t *testing.T) func() {
490491

491492
// Init runtime.
492493
ctrl.SetLogger(logger)
493-
mgr, err := ctrl.NewManager(cfg, ctrl.Options{Scheme: scheme})
494+
495+
mgr, err := server.NewDefaultManager("default", "vllm-llama2-7b-pool", cfg)
494496
if err != nil {
495497
logutil.Fatal(logger, err, "Failed to create controller manager")
496498
}

0 commit comments

Comments
 (0)