Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f81af65
Integrate c6id EC2 instances into Airflow CWL DAGs
nikki-t Mar 19, 2025
6ed3177
Merge branch 'develop' of github.com:unity-sds/unity-sps into 362-c6i…
nikki-t Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions airflow/plugins/unity_sps_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion terraform-unity/modules/terraform-unity-sps-karpenter-node-config/node-user-data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions terraform-unity/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down