Merge pull request #118 from luomingmeng/dev/support-min-ignore-reclaimed-resource-for-report

add MinIgnoredReclaimedResourceForReport to avoid resource fragmentation

Author: xu282934741

config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml

@@ -626,16 +626,32 @@ spec:
                                 type: number
                             type: object
                         type: object
+                      minIgnoredReclaimedResourceForReport:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: 'MinIgnoredReclaimedResourceForReport defines
+                          per-resource minimum thresholds. If ANY resource''s current
+                          reclaimed amount falls below its respective threshold, ALL
+                          reclaimed resources will be ignored and reported as zero.
+                          This prevents resource fragmentation in quota calculations
+                          by avoiding reporting insignificant reclaimed quantities.
+                          For example, {"cpu": 0.1, "memory": 100Mi}.'
+                        type: object
                       minReclaimedResourceForAllocate:
                         additionalProperties:
                           anyOf:
                           - type: integer
                           - type: string
                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                           x-kubernetes-int-or-string: true
-                        description: MinReclaimedResourceForAllocate is a resource
+                        description: 'MinReclaimedResourceForAllocate is a resource
                           reserved for reclaimed_cores pods，these resources will not
-                          be used by shared_cores pods.
+                          be used by shared_cores pods. For example, {"cpu": 4, "memory":
+                          0Gi}.'
                         type: object
                       minReclaimedResourceForReport:
                         additionalProperties:
@@ -644,10 +660,11 @@ spec:
                           - type: string
                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                           x-kubernetes-int-or-string: true
-                        description: MinReclaimedResourceForReport is a minimum reclaimed
+                        description: 'MinReclaimedResourceForReport is a minimum reclaimed
                           resource for report to custom node resource, which means
                           if reclaimed resource is less than MinReclaimedResourceForReport,
                           then reclaimed resource will be reported as MinReclaimedResourceForReport.
+                          For example, {"cpu": 4, "memory": 5Gi}.'
                         type: object
                       reservedResourceForAllocate:
                         additionalProperties:
@@ -656,10 +673,11 @@ spec:
                           - type: string
                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                           x-kubernetes-int-or-string: true
-                        description: ReservedResourceForAllocate is a resource reserved
+                        description: 'ReservedResourceForAllocate is a resource reserved
                           for non-reclaimed_cores pods that are not allocated to reclaimed_cores
                           pods. It is used to set aside some buffer resources to avoid
-                          sudden increase in resource requirements.
+                          sudden increase in resource requirements. For example, {"cpu":
+                          4, "memory": 5Gi}.'
                         type: object
                       reservedResourceForReport:
                         additionalProperties:
@@ -668,10 +686,10 @@ spec:
                           - type: string
                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                           x-kubernetes-int-or-string: true
-                        description: ReservedResourceForReport is a reserved resource
+                        description: 'ReservedResourceForReport is a reserved resource
                           for report to custom node resource, which is used to prevent
                           reclaim resource from being requested by reclaimed_cores
-                          pods.
+                          pods. For example, {"cpu": 0, "memory": 0Gi}.'
                         type: object
                     type: object
                 type: object

config/crd/bases/node.katalyst.kubewharf.io_customnoderesources.yaml

@@ -62,7 +62,7 @@ spec:
                   type: object
                 type: array
               taints:
-                description: Taints customized taints for katalyst, which affect pod
+                description: Taints customized taint for katalyst, which affect pod
                   scheduling based on their QoS levels and the specified taint's QoS
                   level.
                 items:

pkg/apis/config/v1alpha1/adminqos.go

@@ -91,23 +91,34 @@ type ReclaimedResourceConfig struct {
 
 	// ReservedResourceForReport is a reserved resource for report to custom node resource, which is used to
 	// prevent reclaim resource from being requested by reclaimed_cores pods.
+	// For example, {"cpu": 0, "memory": 0Gi}.
 	// +optional
 	ReservedResourceForReport *v1.ResourceList `json:"reservedResourceForReport,omitempty"`
 
 	// MinReclaimedResourceForReport is a minimum reclaimed resource for report to custom node resource, which means
 	// if reclaimed resource is less than MinReclaimedResourceForReport, then reclaimed resource will be reported as
 	// MinReclaimedResourceForReport.
+	// For example, {"cpu": 4, "memory": 5Gi}.
 	// +optional
 	MinReclaimedResourceForReport *v1.ResourceList `json:"minReclaimedResourceForReport,omitempty"`
 
+	// MinIgnoredReclaimedResourceForReport defines per-resource minimum thresholds. If ANY resource's current reclaimed amount
+	// falls below its respective threshold, ALL reclaimed resources will be ignored and reported as zero. This prevents resource
+	// fragmentation in quota calculations by avoiding reporting insignificant reclaimed quantities.
+	// For example, {"cpu": 0.1, "memory": 100Mi}.
+	// +optional
+	MinIgnoredReclaimedResourceForReport *v1.ResourceList `json:"minIgnoredReclaimedResourceForReport,omitempty"`
+
 	// ReservedResourceForAllocate is a resource reserved for non-reclaimed_cores pods that are not allocated to
 	// reclaimed_cores pods. It is used to set aside some buffer resources to avoid sudden increase in resource
 	// requirements.
+	// For example, {"cpu": 4, "memory": 5Gi}.
 	// +optional
 	ReservedResourceForAllocate *v1.ResourceList `json:"reservedResourceForAllocate,omitempty"`
 
 	// MinReclaimedResourceForAllocate is a resource reserved for reclaimed_cores pods，these resources will not be used
 	// by shared_cores pods.
+	// For example, {"cpu": 4, "memory": 0Gi}.
 	// +optional
 	MinReclaimedResourceForAllocate *v1.ResourceList `json:"minReclaimedResourceForAllocate,omitempty"`