Merge pull request #364 from unity-sds/362-c6id-instance-type

Integrate c6id EC2 instances into Airflow CWL DAGs (#362)

Author: LucaCinquini

airflow/plugins/unity_sps_utils.py

@@ -112,6 +112,21 @@
         "cpu": 64,
         "memory": 128,
     },
+    "c6id.xlarge": {
+        "desc": "Compute Optimized with SSD local storage",
+        "cpu": 4,
+        "memory": 8,
+    },
+    "c6id.2xlarge": {
+        "desc": "Compute Optimized with SSD local storage",
+        "cpu": 8,
+        "memory": 16,
+    },
+    "c6id.4xlarge": {
+        "desc": "Compute Optimized with SSD local storage",
+        "cpu": 16,
+        "memory": 32,
+    },
     "m5ad.xlarge": {
         "desc": "General Purpose with SSD local storage",
         "cpu": 4,

terraform-unity/modules/terraform-unity-sps-karpenter-node-config/node-user-data.sh

@@ -17,7 +17,7 @@ echo "Instance family: $instance_family"
 #
 # Exit if instance family does not support NVME SSD instance store
 #
-if [[ $instance_family != "m5ad" ]]; then
+if [[ $instance_family != "m5ad" ]] && [[ $instance_family != "c6id" ]]; then
   exit 0
 fi
 

terraform-unity/variables.tf

@@ -156,7 +156,7 @@ variable "karpenter_node_pools" {
         {
           key      = "karpenter.k8s.aws/instance-family"
           operator = "In"
-          values   = ["m7i", "m6i", "m5", "m5ad", "t3", "c7i", "c6i", "c5", "r7i", "r6i", "r5"]
+          values   = ["m7i", "m6i", "m5", "m5ad", "t3", "c7i", "c6i", "c6id", "c5", "r7i", "r6i", "r5"]
         },
         {
           key      = "karpenter.k8s.aws/instance-cpu"
@@ -200,7 +200,7 @@ variable "karpenter_node_pools" {
         {
           key      = "karpenter.k8s.aws/instance-family"
           operator = "In"
-          values   = ["m7i", "m6i", "m5", "m5ad", "t3", "c7i", "c6i", "c5", "r7i", "r6i", "r5"]
+          values   = ["m7i", "m6i", "m5", "m5ad", "t3", "c7i", "c6i", "c6id", "c5", "r7i", "r6i", "r5"]
         },
         {
           key      = "karpenter.k8s.aws/instance-cpu"
@@ -244,7 +244,7 @@ variable "karpenter_node_pools" {
         {
           key      = "karpenter.k8s.aws/instance-family"
           operator = "In"
-          values   = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c5", "r7i", "r6i", "r5", "m5ad"]
+          values   = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c6id", "c5", "r7i", "r6i", "r5", "m5ad"]
         },
         {
           key      = "karpenter.k8s.aws/instance-cpu"
@@ -287,7 +287,7 @@ variable "karpenter_node_pools" {
         {
           key      = "karpenter.k8s.aws/instance-family"
           operator = "In"
-          values   = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c5", "r7i", "r6i", "r5", "m5ad"]
+          values   = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c6id", "c5", "r7i", "r6i", "r5", "m5ad"]
         },
         {
           key      = "karpenter.k8s.aws/instance-cpu"