Update pb.MaxAvailableComponentSetsRequest to hold namespace under root

Signed-off-by: RainbowMango <[email protected]>

Author: RainbowMango

pkg/estimator/client/accurate.go

@@ -89,12 +89,7 @@ func (se *SchedulerEstimator) GetUnschedulableReplicas(
 	})
 }
 
-func (se *SchedulerEstimator) maxAvailableComponentSets(
-	ctx context.Context,
-	cluster string,
-	namespace string,
-	components []workv1alpha2.Component,
-) (int32, error) {
+func (se *SchedulerEstimator) maxAvailableComponentSets(ctx context.Context, cluster string, namespace string, components []workv1alpha2.Component) (int32, error) {
 	client, err := se.cache.GetClient(cluster)
 	if err != nil {
 		return 0, err
@@ -103,6 +98,7 @@ func (se *SchedulerEstimator) maxAvailableComponentSets(
 	pbReq := &pb.MaxAvailableComponentSetsRequest{
 		Cluster:    cluster,
 		Components: make([]pb.Component, 0, len(components)),
+		Namespace:  namespace,
 	}
 
 	for _, comp := range components {
@@ -115,7 +111,7 @@ func (se *SchedulerEstimator) maxAvailableComponentSets(
 		pbReq.Components = append(pbReq.Components, pb.Component{
 			Name:                comp.Name,
 			Replicas:            comp.Replicas,
-			ReplicaRequirements: toPBReplicaRequirements(cr, namespace),
+			ReplicaRequirements: toPBReplicaRequirements(cr),
 		})
 	}
 
@@ -126,10 +122,9 @@ func (se *SchedulerEstimator) maxAvailableComponentSets(
 	return res.MaxSets, nil
 }
 
-// toPBReplicaRequirements converts the API ComponentReplicaRequirements to the pb.ReplicaRequirements value.
-func toPBReplicaRequirements(cr *workv1alpha2.ComponentReplicaRequirements, namespace string) pb.ReplicaRequirements {
-	var out pb.ReplicaRequirements
-	out.Namespace = namespace
+// toPBReplicaRequirements converts the API ComponentReplicaRequirements to the pb.ComponentReplicaRequirements value.
+func toPBReplicaRequirements(cr *workv1alpha2.ComponentReplicaRequirements) pb.ComponentReplicaRequirements {
+	var out pb.ComponentReplicaRequirements
 	if cr == nil {
 		return out
 	}

pkg/estimator/pb/generated.pb.go

@@ -124,10 +124,16 @@ type MaxAvailableComponentSetsRequest struct {
 	// Cluster is the target cluster where the scheduling estimation is performed.
 	// +required
 	Cluster string `json:"cluster" protobuf:"bytes,1,opt,name=cluster"`
+
 	// Components lists the component types that form one full workload set,
 	// along with their resource and replica requirements.
 	// +required
 	Components []Component `json:"components" protobuf:"bytes,2,rep,name=components"`
+
+	// Namespace is the namespace of the workload being estimated.
+	// It is used by the accurate estimator to check the quota configurations
+	// in the target member cluster.
+	Namespace string `json:"namespace" protobuf:"bytes,3,opt,name=namespace"`
 }
 
 // Component defines the scheduling and resource requirements for a single
@@ -136,15 +142,35 @@ type Component struct {
 	// Name is the identifier of the component within the workload set.
 	// +required
 	Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
+
 	// ReplicaRequirements specifies the per-replica resource requirements
 	// (CPU, memory, etc.) and scheduling constraints.
 	// +required
-	ReplicaRequirements ReplicaRequirements `json:"replicaRequirements" protobuf:"bytes,2,opt,name=replicaRequirements"`
+	ReplicaRequirements ComponentReplicaRequirements `json:"replicaRequirements" protobuf:"bytes,2,opt,name=replicaRequirements"`
+
 	// Replicas is the number of replicas of this component required in a single workload set.
 	// +required
 	Replicas int32 `json:"replicas" protobuf:"varint,3,opt,name=replicas"`
 }
 
+// ComponentReplicaRequirements represents the requirements required by each replica.
+type ComponentReplicaRequirements struct {
+	// NodeClaim represents the NodeAffinity, NodeSelector and Tolerations required by each replica.
+	// +optional
+	NodeClaim *NodeClaim `json:"nodeClaim,omitempty" protobuf:"bytes,1,opt,name=nodeClaim"`
+
+	// ResourceRequest represents the resources required by each replica.
+	// +optional
+	ResourceRequest corev1.ResourceList `json:"resourceRequest,omitempty" protobuf:"bytes,2,rep,name=resourceRequest,casttype=k8s.io/api/core/v1.ResourceList,castkey=k8s.io/api/core/v1.ResourceName"`
+
+	// PriorityClassName represents the priority class name for a given ResourceRequest
+	// Resource quotas are introduced for multi tenants sharing a cluster
+	// Besides estimate the replica based on nodes' resources, we need to consider the resource quota of a ResourceRequest
+	// ResourceQuota have an associated set of scopes, one of them is priority class
+	// +optional
+	PriorityClassName string `json:"priorityClassName,omitempty" protobuf:"bytes,3,opt,name=priorityClassName"`
+}
+
 // MaxAvailableComponentSetsResponse is the gRPC response message containing the
 // maximum number of complete component sets that can be scheduled.
 type MaxAvailableComponentSetsResponse struct {

pkg/estimator/pb/generated.proto

@@ -81,7 +81,7 @@ func (es *AccurateSchedulerEstimatorServer) EstimateComponents(ctx context.Conte
 		return 0, nil
 	}
 
-	maxAvailableComponentSets, err := es.estimateComponents(ctx, snapShot, request.Components)
+	maxAvailableComponentSets, err := es.estimateComponents(ctx, snapShot, request.Components, request.Namespace)
 	if err != nil {
 		return 0, err
 	}
@@ -90,12 +90,8 @@ func (es *AccurateSchedulerEstimatorServer) EstimateComponents(ctx context.Conte
 	return maxAvailableComponentSets, nil
 }
 
-func (es *AccurateSchedulerEstimatorServer) estimateComponents(
-	ctx context.Context,
-	snapshot *schedcache.Snapshot,
-	components []pb.Component,
-) (int32, error) {
-	maxSets, ret := es.estimateFramework.RunEstimateComponentsPlugins(ctx, snapshot, components)
+func (es *AccurateSchedulerEstimatorServer) estimateComponents(ctx context.Context, snapshot *schedcache.Snapshot, components []pb.Component, namespace string) (int32, error) {
+	maxSets, ret := es.estimateFramework.RunEstimateComponentsPlugins(ctx, snapshot, components, namespace)
 
 	// No replicas can be scheduled on the cluster, skip further checks and return 0
 	if ret.IsUnschedulable() {

pkg/estimator/pb/types.go

@@ -44,7 +44,7 @@ type Framework interface {
 	// The integer represents the minimum calculated value of estimated component sets from each EstimateComponentsPlugin.
 	// The Result contains code, reasons and error.
 	// It is merged from all plugins' returned result codes.
-	RunEstimateComponentsPlugins(ctx context.Context, snapshot *schedcache.Snapshot, components []pb.Component) (int32, *Result)
+	RunEstimateComponentsPlugins(ctx context.Context, snapshot *schedcache.Snapshot, components []pb.Component, namespace string) (int32, *Result)
 	// TODO(wengyao04): we can add filter and score plugin extension points if needed in the future
 }
 
@@ -75,7 +75,7 @@ type EstimateComponentsPlugin interface {
 	// The integer represents the estimated number of complete component sets that can be scheduled.
 	// The Result contains code, reasons and error.
 	// It is merged from all plugins' returned result codes.
-	EstimateComponents(ctx context.Context, snapshot *schedcache.Snapshot, components []pb.Component) (int32, *Result)
+	EstimateComponents(ctx context.Context, snapshot *schedcache.Snapshot, components []pb.Component, namespace string) (int32, *Result)
 }
 
 // Handle provides data and some tools that plugins can use. It is

pkg/estimator/server/estimate.go

@@ -112,7 +112,7 @@ func (pl *nodeResourceEstimator) nodeMaxAvailableReplica(node *schedulerframewor
 
 // EstimateComponents estimates the maximum number of complete component sets that can be scheduled.
 // It returns the number of sets that can fit on the available node resources.
-func (pl *nodeResourceEstimator) EstimateComponents(_ context.Context, snapshot *schedcache.Snapshot, components []pb.Component) (int32, *framework.Result) {
+func (pl *nodeResourceEstimator) EstimateComponents(_ context.Context, snapshot *schedcache.Snapshot, components []pb.Component, _ string) (int32, *framework.Result) {
 	if !pl.enabled {
 		klog.V(5).Info("Estimator Plugin", "name", Name, "enabled", pl.enabled)
 		return noNodeConstraint, framework.NewResult(framework.Noopperation, fmt.Sprintf("%s is disabled", pl.Name()))

pkg/estimator/server/framework/interface.go

@@ -52,7 +52,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			},
 			components: []pb.Component{
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("1"),
 							corev1.ResourceMemory: resource.MustParse("1Gi"),
@@ -76,7 +76,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			},
 			components: []pb.Component{
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("1"),
 							corev1.ResourceMemory: resource.MustParse("1Gi"),
@@ -100,7 +100,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			},
 			components: []pb.Component{
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("1"),
 							corev1.ResourceMemory: resource.MustParse("1Gi"),
@@ -124,7 +124,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			},
 			components: []pb.Component{
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("2"),
 							corev1.ResourceMemory: resource.MustParse("2Gi"),
@@ -133,7 +133,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 					Replicas: 1,
 				},
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("3"),
 							corev1.ResourceMemory: resource.MustParse("3Gi"),
@@ -162,7 +162,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			},
 			components: []pb.Component{
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("3"),
 							corev1.ResourceMemory: resource.MustParse("3Gi"),
@@ -171,7 +171,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 					Replicas: 2,
 				},
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("2"),
 							corev1.ResourceMemory: resource.MustParse("2Gi"),
@@ -195,7 +195,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			},
 			components: []pb.Component{
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("3"),
 							corev1.ResourceMemory: resource.MustParse("3Gi"),
@@ -225,7 +225,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			},
 			components: []pb.Component{
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("1"),
 							corev1.ResourceMemory: resource.MustParse("2Gi"),
@@ -254,7 +254,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			},
 			components: []pb.Component{
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("1"),
 							corev1.ResourceMemory: resource.MustParse("1Gi"),
@@ -298,7 +298,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			},
 			components: []pb.Component{
 				{
-					ReplicaRequirements: pb.ReplicaRequirements{
+					ReplicaRequirements: pb.ComponentReplicaRequirements{
 						ResourceRequest: corev1.ResourceList{
 							corev1.ResourceCPU:    resource.MustParse("1"),
 							corev1.ResourceMemory: resource.MustParse("1Gi"),
@@ -352,7 +352,7 @@ func TestNodeResourceEstimator_EstimateComponents(t *testing.T) {
 			}
 
 			// Execute test
-			result, status := pl.EstimateComponents(context.Background(), snapshot, tt.components)
+			result, status := pl.EstimateComponents(context.Background(), snapshot, tt.components, "")
 
 			// Verify results
 			if result != tt.expected {

pkg/estimator/server/framework/plugins/noderesource/noderesource.go

@@ -136,9 +136,7 @@ func (pl *resourceQuotaEstimator) Estimate(_ context.Context,
 // selectors (e.g., priorityClassName), aggregates their resource requirements, and calculates how
 // many complete component sets can fit within the quota. The function returns the minimum allowed
 // sets across all ResourceQuotas to ensure all quota constraints are satisfied.
-func (pl *resourceQuotaEstimator) EstimateComponents(_ context.Context,
-	_ *schedcache.Snapshot,
-	components []pb.Component) (int32, *framework.Result) {
+func (pl *resourceQuotaEstimator) EstimateComponents(_ context.Context, _ *schedcache.Snapshot, components []pb.Component, namespace string) (int32, *framework.Result) {
 	if !pl.enabled {
 		klog.V(5).Info("Estimator Plugin", "name", Name, "enabled", pl.enabled)
 		return noQuotaConstraint, framework.NewResult(framework.Noopperation, fmt.Sprintf("%s is disabled", pl.Name()))
@@ -149,8 +147,6 @@ func (pl *resourceQuotaEstimator) EstimateComponents(_ context.Context,
 		return noQuotaConstraint, framework.NewResult(framework.Noopperation, fmt.Sprintf("%s received empty components list", pl.Name()))
 	}
 
-	namespace := components[0].ReplicaRequirements.Namespace
-
 	rqList, err := pl.rqLister.ResourceQuotas(namespace).List(labels.Everything())
 	if err != nil {
 		klog.Error(err, "failed to list resource quota", "namespace", namespace)