fix: update schema for node class/node requirement

Author: Code2Life

api/v1/gpupool_types.go

@@ -169,7 +169,7 @@ type Requirement struct {
 	Values []string `json:"values,omitempty"`
 }
 
-// +kubebuilder:validation:Enum=node.kubernetes.io/instance-type;kubernetes.io/arch;kubernetes.io/os;topology.kubernetes.io/zone;karpenter.sh/capacity-type;tensor-fusion.ai/gpu-arch
+// +kubebuilder:validation:Enum=node.kubernetes.io/instance-type;kubernetes.io/arch;kubernetes.io/os;topology.kubernetes.io/zone;karpenter.sh/capacity-type;tensor-fusion.ai/gpu-arch;tensor-fusion.ai/gpu-instance-family;tensor-fusion.ai/gpu-instance-size
 type NodeRequirementKey string
 
 const (
@@ -182,6 +182,9 @@ const (
 
 	// capacity-type is charging method, can be spot/preemptive or on-demand
 	NodeRequirementKeyCapacityType NodeRequirementKey = "karpenter.sh/capacity-type"
+
+	NodeRequirementKeyInstanceFamily NodeRequirementKey = "tensor-fusion.ai/gpu-instance-family"
+	NodeRequirementKeyInstanceSize   NodeRequirementKey = "karpenter.k8s.aws/gpu-instance-size"
 )
 
 type Taint struct {

charts/tensor-fusion/crds/tensor-fusion.ai_gpunodeclasses.yaml

@@ -70,8 +70,6 @@ spec:
                   httpTokens:
                     type: string
                 type: object
-              osImageFamily:
-                type: string
               osImageSelectorTerms:
                 items:
                   properties:

config/crd/bases/tensor-fusion.ai_gpupools.yaml

@@ -292,6 +292,8 @@ spec:
                               - topology.kubernetes.io/zone
                               - karpenter.sh/capacity-type
                               - tensor-fusion.ai/gpu-arch
+                              - tensor-fusion.ai/gpu-instance-family
+                              - tensor-fusion.ai/gpu-instance-size
                               type: string
                             operator:
                               default: In
@@ -342,6 +344,8 @@ spec:
                               - topology.kubernetes.io/zone
                               - karpenter.sh/capacity-type
                               - tensor-fusion.ai/gpu-arch
+                              - tensor-fusion.ai/gpu-instance-family
+                              - tensor-fusion.ai/gpu-instance-size
                               type: string
                             operator:
                               default: In

config/crd/bases/tensor-fusion.ai_tensorfusionclusters.yaml

@@ -391,6 +391,8 @@ spec:
                                         - topology.kubernetes.io/zone
                                         - karpenter.sh/capacity-type
                                         - tensor-fusion.ai/gpu-arch
+                                        - tensor-fusion.ai/gpu-instance-family
+                                        - tensor-fusion.ai/gpu-instance-size
                                         type: string
                                       operator:
                                         default: In
@@ -441,6 +443,8 @@ spec:
                                         - topology.kubernetes.io/zone
                                         - karpenter.sh/capacity-type
                                         - tensor-fusion.ai/gpu-arch
+                                        - tensor-fusion.ai/gpu-instance-family
+                                        - tensor-fusion.ai/gpu-instance-size
                                         type: string
                                       operator:
                                         default: In