change name of script and instance type

chrisp018 · Jul 3, 2023 · a6ceefb · a6ceefb
1 parent b765d70
commit a6ceefb
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 38 deletions.
diff --git a/system/infra/modules/skeleton-infra/variables.tf b/system/infra/modules/skeleton-infra/variables.tf
@@ -42,38 +42,38 @@ variable "eks_cluster_name" {
 variable "node_groups" {
   type = any
   default = {
-    # app = {
-    #   disk_size        = 20
-    #   instance_types   = ["m5.2xlarge", "m5a.2xlarge", "m6a.2xlarge"]
-    #   capacity_type    = "SPOT"
-    #   desired_capacity = 2
-    #   max_size         = 3
-    #   min_size         = 2
-    #   kubernetes_taints = [{
-    #     key    = "node-group"
-    #     value  = "app"
-    #     effect = "NO_EXECUTE"
-    #   }]
-    # }
-    # request = {
-    #   disk_size        = 20
-    #   instance_types   = ["m5.2xlarge", "m5a.2xlarge", "m6a.2xlarge"]
-    #   capacity_type    = "SPOT"
-    #   desired_capacity = 2
-    #   max_size         = 3
-    #   min_size         = 2
-    #   kubernetes_taints = [
-    #     {
-    #       key    = "node-group"
-    #       value  = "request"
-    #       effect = "NO_EXECUTE"
-    #     }
-    #   ]
-    # }
+    app = {
+      disk_size        = 20
+      instance_types   = ["m5.2xlarge", "m5a.2xlarge", "m6a.2xlarge"]
+      capacity_type    = "ON_DEMAND"
+      desired_capacity = 2
+      max_size         = 3
+      min_size         = 2
+      kubernetes_taints = [{
+        key    = "node-group"
+        value  = "app"
+        effect = "NO_EXECUTE"
+      }]
+    }
+    request = {
+      disk_size        = 20
+      instance_types   = ["m5.2xlarge", "m5a.2xlarge", "m6a.2xlarge"]
+      capacity_type    = "ON_DEMAND"
+      desired_capacity = 2
+      max_size         = 3
+      min_size         = 2
+      kubernetes_taints = [
+        {
+          key    = "node-group"
+          value  = "request"
+          effect = "NO_EXECUTE"
+        }
+      ]
+    }
     system = {
       disk_size         = 20
       instance_types    = ["t3.medium", "t3a.medium"] #["m5.2xlarge", "m5a.2xlarge", "m6a.2xlarge"] #["t3.medium", "t3a.medium"]
-      capacity_type     = "SPOT"
+      capacity_type     = "ON_DEMAND"
       desired_capacity  = 1
       max_size          = 3
       min_size          = 1

diff --git a/system/ops/script-create-app.sh → system/ops/create-app.sh b/system/ops/script-create-app.sh → system/ops/create-app.sh
diff --git a/system/ops/script-create-loadtest.sh → system/ops/create-loadtest.sh b/system/ops/script-create-loadtest.sh → system/ops/create-loadtest.sh
diff --git a/system/ops/script-create-system.sh → system/ops/create-system.sh b/system/ops/script-create-system.sh → system/ops/create-system.sh
diff --git a/system/ops/script-create-validation.sh → system/ops/create-validation.sh b/system/ops/script-create-validation.sh → system/ops/create-validation.sh
diff --git a/system/ops/script-destroy-app.sh → system/ops/destroy-app.sh b/system/ops/script-destroy-app.sh → system/ops/destroy-app.sh
diff --git a/system/ops/script-destroy-system.sh → system/ops/destroy-system.sh b/system/ops/script-destroy-system.sh → system/ops/destroy-system.sh
diff --git a/system/terraform.tfstate b/system/terraform.tfstate