using namespaced name (#707)

Signed-off-by: Nir Rozenbaum <[email protected]>

Author: nirrozenbaum

cmd/epp/main.go

@@ -30,6 +30,7 @@ import (
 	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc"
 	healthPb "google.golang.org/grpc/health/grpc_health_v1"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
 	"k8s.io/component-base/metrics/legacyregistry"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -140,7 +141,11 @@ func run() error {
 		return err
 	}
 
-	mgr, err := runserver.NewDefaultManager(*poolNamespace, *poolName, cfg)
+	poolNamespacedName := types.NamespacedName{
+		Namespace: *poolNamespace,
+		Name:      *poolName,
+	}
+	mgr, err := runserver.NewDefaultManager(poolNamespacedName, cfg)
 	if err != nil {
 		setupLog.Error(err, "Failed to create controller manager")
 		return err

pkg/epp/server/controller_manager.go

@@ -22,6 +22,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
@@ -40,28 +41,28 @@ func init() {
 }
 
 // defaultManagerOptions returns the default options used to create the manager.
-func defaultManagerOptions(namespace string, name string) ctrl.Options {
+func defaultManagerOptions(namespacedName types.NamespacedName) ctrl.Options {
 	return ctrl.Options{
 		Scheme: scheme,
 		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&corev1.Pod{}: {
 					Namespaces: map[string]cache.Config{
-						namespace: {},
+						namespacedName.Namespace: {},
 					},
 				},
 				&v1alpha2.InferencePool{}: {
 					Namespaces: map[string]cache.Config{
-						namespace: {
+						namespacedName.Namespace: {
 							FieldSelector: fields.SelectorFromSet(fields.Set{
-								"metadata.name": name,
+								"metadata.name": namespacedName.Name,
 							}),
 						},
 					},
 				},
 				&v1alpha2.InferenceModel{}: {
 					Namespaces: map[string]cache.Config{
-						namespace: {},
+						namespacedName.Namespace: {},
 					},
 				},
 			},
@@ -70,8 +71,8 @@ func defaultManagerOptions(namespace string, name string) ctrl.Options {
 }
 
 // NewDefaultManager creates a new controller manager with default configuration.
-func NewDefaultManager(namespace, name string, restConfig *rest.Config) (ctrl.Manager, error) {
-	manager, err := ctrl.NewManager(restConfig, defaultManagerOptions(namespace, name))
+func NewDefaultManager(namespacedName types.NamespacedName, restConfig *rest.Config) (ctrl.Manager, error) {
+	manager, err := ctrl.NewManager(restConfig, defaultManagerOptions(namespacedName))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create controller manager: %v", err)
 	}