From f9d770ad9c519879ecad99979b739c77dfc3538e Mon Sep 17 00:00:00 2001 From: NEM-NE Date: Tue, 27 Sep 2022 23:45:30 +0900 Subject: [PATCH 1/4] refactor: change database spec --- live/dev/main.tf | 2 +- live/prod/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/live/dev/main.tf b/live/dev/main.tf index fde1c28..8c5c578 100644 --- a/live/dev/main.tf +++ b/live/dev/main.tf @@ -64,5 +64,5 @@ module "eks" { disk_size = 50 } - database_node_instance_types = ["t3.nano"] + database_node_instance_types = ["t3.small"] } diff --git a/live/prod/main.tf b/live/prod/main.tf index 28c9e34..6bed8e6 100644 --- a/live/prod/main.tf +++ b/live/prod/main.tf @@ -64,7 +64,7 @@ module "eks" { disk_size = 50 } - database_node_instance_types = ["t3.nano"] + database_node_instance_types = ["t3.small"] } module "iam" { From 04175fa14f4fade77bc8ed4778692ab06c045ce3 Mon Sep 17 00:00:00 2001 From: NEM-NE Date: Tue, 27 Sep 2022 23:46:20 +0900 Subject: [PATCH 2/4] refactor: remove argocd delete command --- live/clean-up.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/live/clean-up.sh b/live/clean-up.sh index e9fb857..16d8e81 100755 --- a/live/clean-up.sh +++ b/live/clean-up.sh @@ -33,9 +33,6 @@ fi cd $SO1S_ENV_PATH -kubectl delete -f $SO1S_DEPLOY_REPO_PATH/root-$SO1S_ENV_NAME.yaml --wait -kubectl delete -f $SO1S_DEPLOY_REPO_PATH/project/project-$SO1S_ENV_NAME.yaml --wait - helm uninstall argocd -n argocd --wait if [ $SO1S_ENV_NUMBER -eq 1 ]; then From 600a8be10e7380f9122d23799c6e8ba777151b49 Mon Sep 17 00:00:00 2001 From: NEM-NE Date: Tue, 27 Sep 2022 23:46:45 +0900 Subject: [PATCH 3/4] refactor: remove backend remote state in dev --- live/dev/versions.tf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/live/dev/versions.tf b/live/dev/versions.tf index 32accc8..1f03767 100644 --- a/live/dev/versions.tf +++ b/live/dev/versions.tf @@ -5,11 +5,4 @@ terraform { version = "4.28.0" } } - - backend "s3" { - bucket = "so1s-terraform-remote-state-storage" - region = "ap-northeast-2" - dynamodb_table = "remote_state_locking" - encrypt = true - } } From a49bf3af4bf69fe4f4782f9f86353cf5edbc6f46 Mon Sep 17 00:00:00 2001 From: NEM-NE Date: Wed, 28 Sep 2022 00:42:44 +0900 Subject: [PATCH 4/4] fix: add condition statement --- live/clean-up.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/live/clean-up.sh b/live/clean-up.sh index 16d8e81..081b05f 100755 --- a/live/clean-up.sh +++ b/live/clean-up.sh @@ -33,6 +33,10 @@ fi cd $SO1S_ENV_PATH +if [ $SO1S_ENV_NUMBER -eq 1 ]; then + kubectl delete -f $SO1S_DEPLOY_REPO_PATH/root-$SO1S_ENV_NAME.yaml --wait +fi + helm uninstall argocd -n argocd --wait if [ $SO1S_ENV_NUMBER -eq 1 ]; then