diff --git a/terraform-unity/modules/terraform-unity-sps-eks/README.md b/terraform-unity/modules/terraform-unity-sps-eks/README.md index 115b3c8c..7c7f801d 100644 --- a/terraform-unity/modules/terraform-unity-sps-eks/README.md +++ b/terraform-unity/modules/terraform-unity-sps-eks/README.md @@ -38,7 +38,7 @@ | [cluster\_version](#input\_cluster\_version) | The EKS cluster version (must be supported by the cs-infra module). | `string` | `"1.33"` | no | | [deployment\_name](#input\_deployment\_name) | The name of the deployment. | `string` | `""` | no | | [installprefix](#input\_installprefix) | The install prefix for the service area (unused) | `string` | `""` | no | -| [nodegroups](#input\_nodegroups) | A map of node group configurations |
map(object({
create_iam_role = optional(bool)
iam_role_arn = optional(string)
ami_id = optional(string)
min_size = optional(number)
max_size = optional(number)
desired_size = optional(number)
instance_types = optional(list(string))
capacity_type = optional(string)
metadata_options = optional(map(any))
block_device_mappings = optional(map(object({
device_name = string
ebs = object({
volume_size = number
volume_type = string
encrypted = bool
delete_on_termination = bool
})
})))
}))
|
{
"defaultGroup": {
"block_device_mappings": {
"xvda": {
"device_name": "/dev/xvda",
"ebs": {
"delete_on_termination": true,
"encrypted": true,
"volume_size": 100,
"volume_type": "gp2"
}
}
},
"desired_size": 1,
"instance_types": [
"m5.2xlarge"
],
"max_size": 1,
"metadata_options": {
"http_endpoint": "enabled",
"http_put_response_hop_limit": 3
},
"min_size": 1
}
}
| no | +| [nodegroups](#input\_nodegroups) | A map of node group configurations |
map(object({
create_iam_role = optional(bool)
iam_role_arn = optional(string)
ami_id = optional(string)
min_size = optional(number)
max_size = optional(number)
desired_size = optional(number)
instance_types = optional(list(string))
capacity_type = optional(string)
metadata_options = optional(map(any))
block_device_mappings = optional(map(object({
device_name = string
ebs = object({
volume_size = number
volume_type = string
encrypted = bool
delete_on_termination = bool
})
})))
}))
|
{
"defaultGroup": {
"block_device_mappings": {
"xvda": {
"device_name": "/dev/xvda",
"ebs": {
"delete_on_termination": true,
"encrypted": true,
"volume_size": 100,
"volume_type": "gp2"
}
}
},
"desired_size": 1,
"instance_types": [
"m5.xlarge"
],
"max_size": 1,
"metadata_options": {
"http_endpoint": "enabled",
"http_put_response_hop_limit": 3
},
"min_size": 1
}
}
| no | | [project](#input\_project) | The project or mission deploying Unity SPS | `string` | `"unity"` | no | | [release](#input\_release) | The software release version. | `string` | `"25.3"` | no | | [service\_area](#input\_service\_area) | The service area owner of the resources being deployed | `string` | `"sps"` | no | diff --git a/terraform-unity/modules/terraform-unity-sps-eks/variables.tf b/terraform-unity/modules/terraform-unity-sps-eks/variables.tf index 05c4f592..21d5e8bc 100644 --- a/terraform-unity/modules/terraform-unity-sps-eks/variables.tf +++ b/terraform-unity/modules/terraform-unity-sps-eks/variables.tf @@ -72,7 +72,7 @@ variable "nodegroups" { })) default = { defaultGroup = { - instance_types = ["m5.2xlarge"] + instance_types = ["c5.xlarge"] min_size = 1 max_size = 1 desired_size = 1 diff --git a/terraform-unity/variables.tf b/terraform-unity/variables.tf index 4e6bbe48..9d590a7c 100644 --- a/terraform-unity/variables.tf +++ b/terraform-unity/variables.tf @@ -169,7 +169,7 @@ variable "karpenter_node_pools" { { key = "karpenter.k8s.aws/instance-family" operator = "In" - values = ["m7i", "m6i", "m5", "m5ad", "t3", "c7i", "c6i", "c6id", "c5", "r7i", "r6i", "r5"] + values = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c5"] }, { key = "karpenter.k8s.aws/instance-cpu" @@ -213,7 +213,7 @@ variable "karpenter_node_pools" { { key = "karpenter.k8s.aws/instance-family" operator = "In" - values = ["m7i", "m6i", "m5", "m5ad", "t3", "c7i", "c6i", "c6id", "c5", "r7i", "r6i", "r5"] + values = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c5"] }, { key = "karpenter.k8s.aws/instance-cpu" @@ -257,7 +257,7 @@ variable "karpenter_node_pools" { { key = "karpenter.k8s.aws/instance-family" operator = "In" - values = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c6id", "c5", "r7i", "r6i", "r5", "m5ad"] + values = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c5"] }, { key = "karpenter.k8s.aws/instance-cpu" @@ -300,7 +300,7 @@ variable "karpenter_node_pools" { { key = "karpenter.k8s.aws/instance-family" operator = "In" - values = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c6id", "c5", "r7i", "r6i", "r5", "m5ad"] + values = ["m7i", "m6i", "m5", "t3", "c7i", "c6i", "c5"] }, { key = "karpenter.k8s.aws/instance-cpu" @@ -310,7 +310,7 @@ variable "karpenter_node_pools" { { key = "karpenter.k8s.aws/instance-cpu" operator = "Lt" - values = ["17"] // To 16 inclusive + values = ["5"] // To 4 inclusive (m5.xlarge max) }, { key = "karpenter.k8s.aws/instance-memory" @@ -320,7 +320,7 @@ variable "karpenter_node_pools" { { key = "karpenter.k8s.aws/instance-memory" operator = "Lt" - values = ["65537"] // To 64 GB inclusive + values = ["16385"] // To 16 GB inclusive (m5.xlarge max) }, { key = "karpenter.k8s.aws/instance-hypervisor", @@ -378,5 +378,5 @@ variable "installprefix" { variable "db_instance_class" { description = "The SPS RDS database instance class" type = string - default = "db.m5d.xlarge" + default = "db.t3.medium" }