Skip to content

Commit 49b32fd

Browse files
committed
Move controller manager build function to pkg/epp/server so we can better test it
1 parent 430ff72 commit 49b32fd

File tree

1 file changed

+2
-41
lines changed

1 file changed

+2
-41
lines changed

Diff for: cmd/epp/main.go

+2-41
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,12 @@ import (
3030
"go.uber.org/zap/zapcore"
3131
"google.golang.org/grpc"
3232
healthPb "google.golang.org/grpc/health/grpc_health_v1"
33-
corev1 "k8s.io/api/core/v1"
34-
"k8s.io/apimachinery/pkg/fields"
35-
"k8s.io/apimachinery/pkg/runtime"
36-
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
37-
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
3833
"k8s.io/client-go/rest"
3934
"k8s.io/component-base/metrics/legacyregistry"
4035
ctrl "sigs.k8s.io/controller-runtime"
41-
"sigs.k8s.io/controller-runtime/pkg/cache"
42-
"sigs.k8s.io/controller-runtime/pkg/client"
4336
"sigs.k8s.io/controller-runtime/pkg/log/zap"
4437
"sigs.k8s.io/controller-runtime/pkg/manager"
4538
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
46-
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha2"
4739
"sigs.k8s.io/gateway-api-inference-extension/internal/runnable"
4840
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend"
4941
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/vllm"
@@ -101,15 +93,9 @@ var (
10193
"are assumed to be named tls.crt and tls.key, respectively. If not set, and secureServing is enabled, "+
10294
"then a self-signed certificate is used.")
10395

104-
scheme = runtime.NewScheme()
10596
setupLog = ctrl.Log.WithName("setup")
10697
)
10798

108-
func init() {
109-
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
110-
utilruntime.Must(v1alpha2.AddToScheme(scheme))
111-
}
112-
11399
func main() {
114100
if err := run(); err != nil {
115101
os.Exit(1)
@@ -144,34 +130,9 @@ func run() error {
144130
return err
145131
}
146132

147-
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
148-
Scheme: scheme,
149-
Cache: cache.Options{
150-
ByObject: map[client.Object]cache.ByObject{
151-
&corev1.Pod{}: {
152-
Namespaces: map[string]cache.Config{
153-
*poolNamespace: {},
154-
},
155-
},
156-
&v1alpha2.InferencePool{}: {
157-
Namespaces: map[string]cache.Config{
158-
*poolNamespace: {
159-
FieldSelector: fields.SelectorFromSet(fields.Set{
160-
"metadata.name": *poolName,
161-
}),
162-
},
163-
},
164-
},
165-
&v1alpha2.InferenceModel{}: {
166-
Namespaces: map[string]cache.Config{
167-
*poolNamespace: {},
168-
},
169-
},
170-
},
171-
},
172-
})
133+
mgr, err := runserver.NewDefaultManager(*poolNamespace, *poolName)
173134
if err != nil {
174-
setupLog.Error(err, "Failed to create controller manager", "config", cfg)
135+
setupLog.Error(err, "Failed to create controller manager")
175136
return err
176137
}
177138

0 commit comments

Comments
 (0)