fix: use NamespacedName instead of ObjectReference

henrichter · henrichter · commit c91ba509935f · 2026-02-19T12:41:07.000+01:00
diff --git a/internal/scheduling/lib/weigher.go b/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"
 )
 
@@ -34,16 +34,13 @@ func (s *BaseWeigher[RequestType, Opts]) Init(ctx context.Context, client client
 }
 
 // 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.
diff --git a/internal/scheduling/lib/weigher_test.go b/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"
 )
@@ -106,7 +106,7 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges(t *testing.T) {
 	tests := []struct {
 		name        string
 		knowledges  []v1alpha1.Knowledge
-		refs        []corev1.ObjectReference
+		refs        []types.NamespacedName
 		expectError bool
 		errorMsg    string
 	}{
@@ -129,15 +129,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,
@@ -162,7 +162,7 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges(t *testing.T) {
 					},
 				},
 			},
-			refs: []corev1.ObjectReference{
+			refs: []types.NamespacedName{
 				{Name: "knowledge1", Namespace: "default"},
 			},
 			expectError: true,
@@ -187,7 +187,7 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges(t *testing.T) {
 					},
 				},
 			},
-			refs: []corev1.ObjectReference{
+			refs: []types.NamespacedName{
 				{Name: "knowledge1", Namespace: "default"},
 			},
 			expectError: true,
@@ -196,7 +196,7 @@ func TestBaseFilterWeigherPipelineStep_CheckKnowledges(t *testing.T) {
 		{
 			name:        "empty knowledge list",
 			knowledges:  []v1alpha1.Knowledge{},
-			refs:        []corev1.ObjectReference{},
+			refs:        []types.NamespacedName{},
 			expectError: false,
 		},
 	}
@@ -235,7 +235,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")
diff --git a/internal/scheduling/manila/plugins/weighers/netapp_cpu_usage_balancing.go b/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
diff --git a/internal/scheduling/nova/plugins/weighers/vmware_anti_affinity_noisy_projects.go b/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
diff --git a/internal/scheduling/nova/plugins/weighers/vmware_avoid_long_term_contended_hosts.go b/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
diff --git a/internal/scheduling/nova/plugins/weighers/vmware_avoid_short_term_contended_hosts.go b/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
diff --git a/internal/scheduling/nova/plugins/weighers/vmware_general_purpose_balancing.go b/internal/scheduling/nova/plugins/weighers/vmware_general_purpose_balancing.go
@@ -13,7 +13,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,8 +45,8 @@ func (s *VMwareGeneralPurposeBalancingStep) Init(ctx context.Context, client cli
 		return err
 	}
 	if err := s.CheckKnowledges(ctx,
-		corev1.ObjectReference{Name: "host-utilization"},
-		corev1.ObjectReference{Name: "host-capabilities"},
+		types.NamespacedName{Name: "host-utilization"},
+		types.NamespacedName{Name: "host-capabilities"},
 	); err != nil {
 		return err
 	}
diff --git a/internal/scheduling/nova/plugins/weighers/vmware_hana_binpacking.go b/internal/scheduling/nova/plugins/weighers/vmware_hana_binpacking.go
@@ -13,7 +13,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,8 +45,8 @@ func (s *VMwareHanaBinpackingStep) Init(ctx context.Context, client client.Clien
 		return err
 	}
 	if err := s.CheckKnowledges(ctx,
-		corev1.ObjectReference{Name: "host-utilization"},
-		corev1.ObjectReference{Name: "host-capabilities"},
+		types.NamespacedName{Name: "host-utilization"},
+		types.NamespacedName{Name: "host-capabilities"},
 	); err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/cobaltcore-dev/cortex/api/v1alpha1"`
`13`	`13`	`"github.com/cobaltcore-dev/cortex/internal/knowledge/extractor/plugins/storage"`
`14`	`14`	`"github.com/cobaltcore-dev/cortex/internal/scheduling/lib"`
`15`		`- corev1 "k8s.io/api/core/v1"`
	`15`	`+ "k8s.io/apimachinery/pkg/types"`
`16`	`16`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`17`	`17`	`)`
`18`	`18`
`@@ -54,7 +54,7 @@ func (s *NetappCPUUsageBalancingStep) Init(ctx context.Context, client client.Cl`
`54`	`54`	`if err := s.BaseWeigher.Init(ctx, client, weigher); err != nil {`
`55`	`55`	`return err`
`56`	`56`	`}`
`57`		`- if err := s.CheckKnowledges(ctx, corev1.ObjectReference{Name: "netapp-storage-pool-cpu-usage-manila"}); err != nil {`
	`57`	`+ if err := s.CheckKnowledges(ctx, types.NamespacedName{Name: "netapp-storage-pool-cpu-usage-manila"}); err != nil {`
`58`	`58`	`return err`
`59`	`59`	`}`
`60`	`60`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"github.com/cobaltcore-dev/cortex/api/v1alpha1"`
`14`	`14`	`"github.com/cobaltcore-dev/cortex/internal/knowledge/extractor/plugins/compute"`
`15`	`15`	`"github.com/cobaltcore-dev/cortex/internal/scheduling/lib"`
`16`		`- corev1 "k8s.io/api/core/v1"`
	`16`	`+ "k8s.io/apimachinery/pkg/types"`
`17`	`17`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`18`	`18`	`)`
`19`	`19`
`@@ -45,8 +45,8 @@ func (s *VMwareGeneralPurposeBalancingStep) Init(ctx context.Context, client cli`
`45`	`45`	`return err`
`46`	`46`	`}`
`47`	`47`	`if err := s.CheckKnowledges(ctx,`
`48`		`- corev1.ObjectReference{Name: "host-utilization"},`
`49`		`- corev1.ObjectReference{Name: "host-capabilities"},`
	`48`	`+ types.NamespacedName{Name: "host-utilization"},`
	`49`	`+ types.NamespacedName{Name: "host-capabilities"},`
`50`	`50`	`); err != nil {`
`51`	`51`	`return err`
`52`	`52`	`}`