feat: [SKU modularization] AWS chart changes

charts/kaito/workspace/templates/clusterrole.yaml

@@ -39,9 +39,15 @@ rules:
   - apiGroups: ["karpenter.sh"]
     resources: ["machines", "machines/status", "nodeclaims", "nodeclaims/status"]
     verbs: ["get","list","watch","create", "delete", "update", "patch"]
+  {{- if eq .Values.cloudProviderName "azure" }}
   - apiGroups: [ "karpenter.azure.com" ]
     resources: [ "aksnodeclasses"]
     verbs: [ "get","list","watch","create", "delete", "update", "patch" ]
+  {{- else if eq .Values.cloudProviderName "aws" }}
+  - apiGroups: [ "karpenter.k8s.aws" ]
+    resources: [ "ec2nodeclasses"]
+    verbs: [ "get","list","watch","create", "delete", "update", "patch" ]
+  {{- end }}
   - apiGroups: ["admissionregistration.k8s.io"]
     resources: ["validatingwebhookconfigurations"]
     verbs: ["get","list","watch"]

charts/kaito/workspace/templates/deployment.yaml

@@ -47,6 +47,8 @@ spec:
               value: {{ .Values.presetRegistryName }}
             - name: CLOUD_PROVIDER
               value: {{ .Values.cloudProviderName }}
+            - name: CLUSTER_NAME
+              value: {{ .Values.clusterName }}
           ports:
             - name: http-metrics
               containerPort: 8080

charts/kaito/workspace/templates/nvidia-device-plugin-ds.yaml

@@ -21,12 +21,17 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
+              {{- if eq .Values.cloudProviderName "azure" }}
               - key: kubernetes.azure.com/cluster
                 operator: Exists
               - key: type
                 operator: NotIn
                 values:
                 - virtual-kubelet
+              {{- else if eq .Values.cloudProviderName "aws" }}
+              - key: "k8s.io/cloud-provider-aws"
+                operator: Exists
+              {{- end }}
       tolerations:
         # Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
         # This, along with the annotation above marks this pod as a critical add-on.

charts/kaito/workspace/values.yaml

@@ -32,3 +32,4 @@ tolerations: []
 affinity: {}
 # Values can be "azure" or "aws"
 cloudProviderName: "azure"
+clusterName: "kaito"

pkg/utils/nodeclaim/nodeclaim.go

@@ -130,6 +130,18 @@ func GenerateNodeClaimManifest(ctx context.Context, storageRequirement string, o
 		}
 		nodeClaimObj.Spec.Requirements = append(nodeClaimObj.Spec.Requirements, nodeSelector)
 	}
+
+	if cloudName == consts.AWSCloudName {
+		nodeSelector := v1beta1.NodeSelectorRequirementWithMinValues{
+			NodeSelectorRequirement: v1.NodeSelectorRequirement{
+				Key:      "karpenter.k8s.aws/instance-gpu-count",
+				Operator: v1.NodeSelectorOpGt,
+				Values:   []string{"0"},
+			},
+		}
+		nodeClaimObj.Spec.Requirements = append(nodeClaimObj.Spec.Requirements, nodeSelector)
+	}
+
 	return nodeClaimObj
 }
 
@@ -170,8 +182,9 @@ func GenerateEC2NodeClassManifest(ctx context.Context) *awsv1beta1.EC2NodeClass
 			Name: consts.NodeClassName,
 		},
 		Spec: awsv1beta1.EC2NodeClassSpec{
-			AMIFamily: lo.ToPtr(awsv1beta1.AMIFamilyAL2), // Amazon Linux 2
-			Role:      fmt.Sprintf("KarpenterNodeRole-%s", clusterName),
+			AMIFamily:           lo.ToPtr(awsv1beta1.AMIFamilyAL2), // Amazon Linux 2
+			Role:                fmt.Sprintf("KarpenterNodeRole-%s", clusterName),
+			InstanceStorePolicy: lo.ToPtr(awsv1beta1.InstanceStorePolicyRAID0), //required to share node's ephermeral storage among pods that request it
 			SubnetSelectorTerms: []awsv1beta1.SubnetSelectorTerm{
 				{
 					Tags: map[string]string{
@@ -201,7 +214,7 @@ func CreateNodeClaim(ctx context.Context, nodeClaimObj *v1beta1.NodeClaim, kubeC
 			return err
 		}
 
-		err = kubeClient.Create(ctx, nodeClaimObj, &client.CreateOptions{})
+		err = kubeClient.Create(ctx, nodeClaimObj.DeepCopy(), &client.CreateOptions{})
 		if err != nil {
 			return err
 		}

pkg/utils/nodeclaim/nodeclaim_test.go

@@ -205,7 +205,7 @@ func TestGenerateNodeClaimManifest(t *testing.T) {
 		assert.Equal(t, nodeClaim.Labels[kaitov1alpha1.LabelWorkspaceNamespace], mockWorkspace.Namespace, "label must have same workspace namespace as workspace")
 		assert.Equal(t, nodeClaim.Labels[consts.LabelNodePool], consts.KaitoNodePoolName, "label must have same labels as workspace label selector")
 		assert.Equal(t, nodeClaim.Annotations[v1beta1.DoNotDisruptAnnotationKey], "true", "label must have do not disrupt annotation")
-		assert.Equal(t, len(nodeClaim.Spec.Requirements), 3, " NodeClaim must have 3 NodeSelector Requirements")
+		assert.Equal(t, len(nodeClaim.Spec.Requirements), 4, " NodeClaim must have 4 NodeSelector Requirements")
 		assert.Check(t, nodeClaim.Spec.NodeClassRef != nil, "NodeClaim must have NodeClassRef")
 		assert.Equal(t, nodeClaim.Spec.NodeClassRef.Kind, "EC2NodeClass", "NodeClaim must have 'EC2NodeClass' kind")
 	})