fix: use NamespacedName instead of ObjectReference

Author: henrichter

internal/scheduling/lib/weigher.go

@@ -9,8 +9,8 @@ import (
 	"fmt"
 
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -42,16 +42,13 @@ func (s *BaseWeigher[RequestType, Opts]) Validate(ctx context.Context, params v1
 }
 
 // Check if all knowledges are ready, and if not, return an error indicating why not.
-func (d *BaseFilterWeigherPipelineStep[RequestType, Opts]) CheckKnowledges(ctx context.Context, kns ...corev1.ObjectReference) error {
+func (d *BaseFilterWeigherPipelineStep[RequestType, Opts]) CheckKnowledges(ctx context.Context, kns ...types.NamespacedName) error {
 	if d.Client == nil {
 		return errors.New("kubernetes client not initialized")
 	}
 	for _, objRef := range kns {
 		knowledge := &v1alpha1.Knowledge{}
-		if err := d.Client.Get(ctx, client.ObjectKey{
-			Name:      objRef.Name,
-			Namespace: objRef.Namespace,
-		}, knowledge); err != nil {
+		if err := d.Client.Get(ctx, objRef, knowledge); err != nil {
 			return fmt.Errorf("failed to get knowledge %s: %w", objRef.Name, err)
 		}
 		// Check if the knowledge status conditions indicate an error.

internal/scheduling/lib/weigher_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
@@ -107,7 +107,7 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges(t *testing.T) {
 	tests := []struct {
 		name        string
 		knowledges  []v1alpha1.Knowledge
-		refs        []corev1.ObjectReference
+		refs        []types.NamespacedName
 		expectError bool
 		errorMsg    string
 	}{
@@ -130,15 +130,15 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges(t *testing.T) {
 					},
 				},
 			},
-			refs: []corev1.ObjectReference{
+			refs: []types.NamespacedName{
 				{Name: "knowledge1", Namespace: "default"},
 			},
 			expectError: false,
 		},
 		{
 			name:       "knowledge not found",
 			knowledges: []v1alpha1.Knowledge{},
-			refs: []corev1.ObjectReference{
+			refs: []types.NamespacedName{
 				{Name: "missing-knowledge", Namespace: "default"},
 			},
 			expectError: true,
@@ -163,7 +163,7 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges(t *testing.T) {
 					},
 				},
 			},
-			refs: []corev1.ObjectReference{
+			refs: []types.NamespacedName{
 				{Name: "knowledge1", Namespace: "default"},
 			},
 			expectError: true,
@@ -188,7 +188,7 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges(t *testing.T) {
 					},
 				},
 			},
-			refs: []corev1.ObjectReference{
+			refs: []types.NamespacedName{
 				{Name: "knowledge1", Namespace: "default"},
 			},
 			expectError: true,
@@ -197,7 +197,7 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges(t *testing.T) {
 		{
 			name:        "empty knowledge list",
 			knowledges:  []v1alpha1.Knowledge{},
-			refs:        []corev1.ObjectReference{},
+			refs:        []types.NamespacedName{},
 			expectError: false,
 		},
 	}
@@ -236,7 +236,7 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges_NilClient(t *testing.T) {
 		Client: nil,
 	}
 
-	err := step.CheckKnowledges(t.Context(), corev1.ObjectReference{Name: "test", Namespace: "default"})
+	err := step.CheckKnowledges(t.Context(), types.NamespacedName{Name: "test", Namespace: "default"})
 
 	if err == nil {
 		t.Error("expected error for nil client but got nil")

internal/scheduling/manila/plugins/weighers/netapp_cpu_usage_balancing.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
 	"github.com/cobaltcore-dev/cortex/internal/knowledge/extractor/plugins/storage"
 	"github.com/cobaltcore-dev/cortex/internal/scheduling/lib"
-	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -54,7 +54,7 @@ func (s *NetappCPUUsageBalancingStep) Init(ctx context.Context, client client.Cl
 	if err := s.BaseWeigher.Init(ctx, client, weigher); err != nil {
 		return err
 	}
-	if err := s.CheckKnowledges(ctx, corev1.ObjectReference{Name: "netapp-storage-pool-cpu-usage-manila"}); err != nil {
+	if err := s.CheckKnowledges(ctx, types.NamespacedName{Name: "netapp-storage-pool-cpu-usage-manila"}); err != nil {
 		return err
 	}
 	return nil

internal/scheduling/nova/plugins/weighers/vmware_anti_affinity_noisy_projects.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
 	"github.com/cobaltcore-dev/cortex/internal/knowledge/extractor/plugins/compute"
 	"github.com/cobaltcore-dev/cortex/internal/scheduling/lib"
-	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -45,7 +45,7 @@ func (s *VMwareAntiAffinityNoisyProjectsStep) Init(ctx context.Context, client c
 	if err := s.BaseWeigher.Init(ctx, client, weigher); err != nil {
 		return err
 	}
-	if err := s.CheckKnowledges(ctx, corev1.ObjectReference{Name: "vmware-project-noisiness"}); err != nil {
+	if err := s.CheckKnowledges(ctx, types.NamespacedName{Name: "vmware-project-noisiness"}); err != nil {
 		return err
 	}
 	return nil

internal/scheduling/nova/plugins/weighers/vmware_avoid_long_term_contended_hosts.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
 	"github.com/cobaltcore-dev/cortex/internal/knowledge/extractor/plugins/compute"
 	"github.com/cobaltcore-dev/cortex/internal/scheduling/lib"
-	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -54,7 +54,7 @@ func (s *VMwareAvoidLongTermContendedHostsStep) Init(ctx context.Context, client
 	if err := s.BaseWeigher.Init(ctx, client, weigher); err != nil {
 		return err
 	}
-	if err := s.CheckKnowledges(ctx, corev1.ObjectReference{Name: "vmware-long-term-contended-hosts"}); err != nil {
+	if err := s.CheckKnowledges(ctx, types.NamespacedName{Name: "vmware-long-term-contended-hosts"}); err != nil {
 		return err
 	}
 	return nil

internal/scheduling/nova/plugins/weighers/vmware_avoid_short_term_contended_hosts.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
 	"github.com/cobaltcore-dev/cortex/internal/knowledge/extractor/plugins/compute"
 	"github.com/cobaltcore-dev/cortex/internal/scheduling/lib"
-	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -54,7 +54,7 @@ func (s *VMwareAvoidShortTermContendedHostsStep) Init(ctx context.Context, clien
 	if err := s.BaseWeigher.Init(ctx, client, weigher); err != nil {
 		return err
 	}
-	if err := s.CheckKnowledges(ctx, corev1.ObjectReference{Name: "vmware-short-term-contended-hosts"}); err != nil {
+	if err := s.CheckKnowledges(ctx, types.NamespacedName{Name: "vmware-short-term-contended-hosts"}); err != nil {
 		return err
 	}
 	return nil

internal/scheduling/nova/plugins/weighers/vmware_binpack.go

@@ -16,6 +16,7 @@ import (
 	"github.com/cobaltcore-dev/cortex/internal/scheduling/lib"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -77,7 +78,7 @@ func (s *VMwareBinpackStep) Init(ctx context.Context, client client.Client, weig
 		return err
 	}
 	if err := s.CheckKnowledges(ctx,
-		corev1.ObjectReference{Name: "host-utilization"},
+		types.NamespacedName{Name: "host-utilization"},
 	); err != nil {
 		return err
 	}