feat: add cpu_limit

ExpediaGroup · Apr 16, 2024 · 9053208 · 9053208
1 parent 23257ae
commit 9053208
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ For more information please refer to the main [Apiary](https://github.com/Expedi
 | aws_region                                   | AWS region to use for resources.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | string |                   -                    |   yes    |
 | bastion_ssh_key_secret_name                  | Secret name in AWS Secrets Manager which stores the private key used to log in to bastions. The secret's key should be `private_key` and the value should be stored as a base64 encoded string. Max character limit for a secret's value is 4096.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | string |                   ``                   |    no    |
 | cpu                                          | The number of CPU units to reserve for the Waggle Dance container. Valid values can be 256, 512, 1024, 2048 and 4096. Reference: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | string |                 `1024`                 |    no    |
+| cpu_limit                                     | The number of CPU units limit to reserve for the Waggle Dance container. Valid values can be 256, 512, 1024, 2048 and 4096. Reference: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | string |                 ``                 |    no    |
 | cpu_scale_in_cooldown                        | Cool down time(seconds) of scale in task by cpu usage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | number |                  300                   |    no    |
 | cpu_scale_out_cooldown                       | Cool down time(seconds) of scale out task by cpu usage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | number |                  120                   |    no    |
 | default_latency                              | Latency used for other (not primary) metastores that don't override it in their own configurations. See `latency` parameter in https://github.com/ExpediaGroup/waggle-dance/blob/main/README.md.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | number |                  `0`                   |    no    |

diff --git a/k8s.tf b/k8s.tf
@@ -10,7 +10,7 @@ locals {
   actuator_port = 18000
   wd_port       = 48869
   k8s_cpu       = var.cpu / 1024
-  k8s_cpu_limit = (var.cpu / 1024) * 1.25
+  k8s_cpu_limit = length(var.cpu_limit) == 0 ? (var.cpu / 1024) * 1.25 : var.cpu_limit
 }
 
 resource "kubernetes_service_account" "waggle_dance" {

diff --git a/variables.tf b/variables.tf
@@ -158,6 +158,17 @@ EOF
   default = "1024"
 }
 
+variable "cpu_limit" {
+  description = <<EOF
+The number of CPU units limit to reserve for the Waggle Dance container.
+Valid values can be 256, 512, 1024, 2048 and 4096.
+Reference: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html
+EOF
+
+  type    = string
+  default = ""
+}
+
 variable "ingress_cidr" {
   description = "Generally allowed ingress CIDR list."
   type        = list(string)