Refine LauncherPoolPolicy struct

Author: osswangxining

api/v1alpha1/launcherpoolpolicy_types.go …fma/v1alpha1/launcherpoolpolicy_types.goapi/v1alpha1/launcherpoolpolicy_types.go renamed to api/fma/v1alpha1/launcherpoolpolicy_types.go api/v1alpha1/launcherpoolpolicy_types.go renamed to api/fma/v1alpha1/launcherpoolpolicy_types.go

@@ -16,12 +16,53 @@ limitations under the License.
 
 package v1alpha1
 
-import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-// PoolPolicy defines the proactive provisioning policy for idle launcher pods.
+import (
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// LauncherPoolPolicy defines the proactive provisioning policy for the idle launcher pods.
+// The LauncherPoolPolicy semantics should be defined as below:
+//
+// ## Multiple LauncherPoolPolicy Objects
+//
+// 1. **Additive Semantics**
+//   - Multiple LauncherPoolPolicy objects follow additive semantics
+//   - All policies across all objects are evaluated together
+//   - Rules from different objects are combined to form the complete policy set
+//
+// 2. **Zero Objects Behavior**
+//   - When no LauncherPoolPolicy objects exist, no proactive provisioning occurs
+//   - System falls back to on-demand launcher pod creation
+//
+// ## Multiple LauncherPoolForNodeType Matching
+//
+// 1. **Multiple Matches**
+//   - When multiple LauncherPoolForNodeType structs match a single Node (across same or different LauncherPoolPolicy objects):
+//     - For each unique combination of (Node, Accelerator, LauncherConfig), select the highest LauncherCount value
+//     - This forms the effective policy for that specific tuple
+//
+// 2. **Zero Matches**
+//   - When no LauncherPoolForNodeType matches a Node:
+//     - No pre-provisioning policy applies to that Node
+//     - Launcher pods for that Node are created on-demand
+//
+// ## Multiple CountForLauncher with Same LauncherConfig
+//
+// 1. **Duplicate LauncherConfig Names**
+//   - When multiple CountForLauncher structs specify the same LauncherConfigName for the same (Node, Accelerator) combination:
+//     - Select the highest LauncherCount value among all matching entries
+//     - This determines the target pool size for that LauncherConfig on that Node with that Accelerator
+//
+// 2. **Zero Matching CountForLauncher**
+//   - When no CountForLauncher matches a specific (Node, Accelerator, LauncherConfig) tuple:
+//     - No pre-provisioning occurs for that specific combination
+//     - Launcher pods are created on-demand when needed
+//
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:path=launcherpoolpolicies,scope=Cluster
+// +kubebuilder:resource:shortName=lpp
 
 type LauncherPoolPolicy struct {
 	metav1.TypeMeta   `json:",inline"`
@@ -60,29 +101,32 @@ type LauncherPoolForNodeType struct {
 	//      memory: ">=200Gi"
 	//      nvidia.com/gpu: ">=1"
 	//      cpu: ">=32"
-	//    # Optional: also support capacity (if total capacity—not just allocatable—is desired)
-	//    # capacity:
-	//    #   memory: ">=256Gi"
 	EnhancedNodeSelector EnhancedNodeSelector `json:"enhancedNodeSelector"`
 
+	// PerAcceleratorCount defines pre-configuration quantities for each accelerator type
+	PerAcceleratorCount []PerAcceleratorCount `json:"perAcceleratorCount"`
+}
+
+// PerAcceleratorCount defines configuration for specific accelerators
+type PerAcceleratorCount struct {
+	// AcceleratorSelector accelerator selector
+	AcceleratorSelector AcceleratorSelector `json:"acceleratorSelector"`
+
 	// CountForLauncher is the total number of launcher for each LauncherConfig
-	// to maintain on each matching node.
-	// If two different counts are specified for the same (Node, LauncherConfig),
+	// to maintain on each matching node per accelerator.
+	// If two different counts are specified for the same (Node, Accelerator, LauncherConfig),
 	// the higher count is used and will be populated into LauncherPoolPolicyStatus.
-	// If no CountForLauncher applies to a given (Node, LauncherConfig), this Node
+	// If no CountForLauncher applies to a given (Node, Accelerator, LauncherConfig), this Node
 	// will be ignored for this LauncherConfig.
 	// +kubebuilder:validation:MinItems=1
 	CountForLauncher []CountForLauncher `json:"countForLauncher"`
 }
 
-// ResourceRequirementSpec defines resource requirements for a node.
-type ResourceRequirementSpec struct {
+// ResourceRequirements defines resource requirements for a node.
+type ResourceRequirements struct {
 	// Allocatable defines the allocatable resources for a node.
 	// +kubebuilder:validation:Required
-	Allocatable map[string]string `json:"allocatable,omitempty"`
-	// Capacity defines the capacity resources for a node.
-	// +kubebuilder:validation:Optional
-	Capacity map[string]string `json:"capacity,omitempty"`
+	Allocatable map[string]resource.Quantity `json:"allocatable,omitempty"`
 }
 
 // EnhancedNodeSelector defines node selector with label selector and resource requirements.
@@ -92,11 +136,25 @@ type EnhancedNodeSelector struct {
 	LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"`
 	// ResourceRequirements defines the resource requirements for a node.
 	// +kubebuilder:validation:Optional
-	ResourceRequirements *ResourceRequirementSpec `json:"resourceRequirements,omitempty"`
+	ResourceRequirements *ResourceRequirements `json:"resourceRequirements,omitempty"`
+	// AcceleratorSelector defines accelerator-specific selection criteria
+	AcceleratorSelector *AcceleratorSelector `json:"acceleratorSelector,omitempty"`
+}
+
+// AcceleratorSelector defines accelerator selection criteria
+type AcceleratorSelector struct {
+	// Type specifies accelerator type (e.g., nvidia.com/gpu)
+	Type string `json:"type,omitempty"`
+
+	// Memory specifies accelerator memory size requirement
+	Memory *resource.Quantity `json:"memory,omitempty"`
+
+	// Count specifies required number of accelerators
+	Count *int32 `json:"count,omitempty"`
 }
 
 type CountForLauncher struct {
-	// LauncherConfigName references the name of the LauncherConfig this policy applies to.
+	// LauncherConfigName is the name of the LauncherConfig this policy applies to.
 	// +kubebuilder:validation:Required
 	LauncherConfigName string `json:"launcherConfigName"`
 
@@ -108,7 +166,7 @@ type CountForLauncher struct {
 type LauncherPoolPolicyStatus struct {
 	// `observedGeneration` is the `metadata.generation` last seen by the controller.
 	// +optional
-	ObservedGeneration int32 `json:"observedGeneration,omitempty"`
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
 	// `errors` reports problems seen in the desired state of this object;
 	// in particular, in the version reported by `observedGeneration`.
@@ -124,7 +182,3 @@ type LauncherPoolPolicyList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []LauncherPoolPolicy `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&LauncherPoolPolicy{}, &LauncherPoolPolicyList{})
-}