From a6ceefb9ef0331ec89f112363c414621b294d2f1 Mon Sep 17 00:00:00 2001
From: clphan <pdkhanh06@gmail.com>
Date: Mon, 3 Jul 2023 22:30:36 +0700
Subject: [PATCH] change name of script and instance type

---
 .../infra/modules/skeleton-infra/variables.tf | 58 +++++++++----------
 .../{script-create-app.sh => create-app.sh}   |  0
 ...-create-loadtest.sh => create-loadtest.sh} |  0
 ...ript-create-system.sh => create-system.sh} |  0
 ...ate-validation.sh => create-validation.sh} |  0
 .../{script-destroy-app.sh => destroy-app.sh} |  0
 ...pt-destroy-system.sh => destroy-system.sh} |  0
 system/terraform.tfstate                      |  9 ---
 8 files changed, 29 insertions(+), 38 deletions(-)
 rename system/ops/{script-create-app.sh => create-app.sh} (100%)
 rename system/ops/{script-create-loadtest.sh => create-loadtest.sh} (100%)
 rename system/ops/{script-create-system.sh => create-system.sh} (100%)
 rename system/ops/{script-create-validation.sh => create-validation.sh} (100%)
 rename system/ops/{script-destroy-app.sh => destroy-app.sh} (100%)
 rename system/ops/{script-destroy-system.sh => destroy-system.sh} (100%)
 delete mode 100644 system/terraform.tfstate

diff --git a/system/infra/modules/skeleton-infra/variables.tf b/system/infra/modules/skeleton-infra/variables.tf
index e54c03d..0a3f245 100644
--- 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 b/system/ops/create-app.sh
similarity index 100%
rename from system/ops/script-create-app.sh
rename to system/ops/create-app.sh
diff --git a/system/ops/script-create-loadtest.sh b/system/ops/create-loadtest.sh
similarity index 100%
rename from system/ops/script-create-loadtest.sh
rename to system/ops/create-loadtest.sh
diff --git a/system/ops/script-create-system.sh b/system/ops/create-system.sh
similarity index 100%
rename from system/ops/script-create-system.sh
rename to system/ops/create-system.sh
diff --git a/system/ops/script-create-validation.sh b/system/ops/create-validation.sh
similarity index 100%
rename from system/ops/script-create-validation.sh
rename to system/ops/create-validation.sh
diff --git a/system/ops/script-destroy-app.sh b/system/ops/destroy-app.sh
similarity index 100%
rename from system/ops/script-destroy-app.sh
rename to system/ops/destroy-app.sh
diff --git a/system/ops/script-destroy-system.sh b/system/ops/destroy-system.sh
similarity index 100%
rename from system/ops/script-destroy-system.sh
rename to system/ops/destroy-system.sh
diff --git a/system/terraform.tfstate b/system/terraform.tfstate
deleted file mode 100644
index 44112e3..0000000
--- a/system/terraform.tfstate
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "version": 4,
-  "terraform_version": "1.4.4",
-  "serial": 1,
-  "lineage": "eb23f6c6-7316-5bbb-979c-601333fb3b26",
-  "outputs": {},
-  "resources": [],
-  "check_results": null
-}