From abbb5079e11eda7d60fc60e644608bf183432466 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Thu, 28 Jan 2021 21:18:16 -0500 Subject: [PATCH] add services variable, update terraform --- deploy.sh | 2 +- kontainme.tf | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/deploy.sh b/deploy.sh index c76d18f..9799f33 100755 --- a/deploy.sh +++ b/deploy.sh @@ -19,4 +19,4 @@ cat $out cd - -terraform apply -var-file=kontainme.tfvars -var-file=$out +terraform apply -var-file=$out diff --git a/kontainme.tf b/kontainme.tf index 6e513ef..5541b2d 100644 --- a/kontainme.tf +++ b/kontainme.tf @@ -4,7 +4,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "3.52.0" + version = "3.54.0" } } } @@ -43,6 +43,62 @@ variable "services" { timeout = string })) description = "services to deploy" + default = { + "buildpack" = { + memory = "4Gi" + cpu = "2" + concurrency = "1" + timeout = "900" # 15m + } + "flatten" = { + memory = "1Gi" + cpu = "1" + concurrency = "80" + timeout = "120" # 2m + } + "kaniko" = { + memory = "4Gi" + cpu = "2" + concurrency = "1" + timeout = "900" # 15m + } + "ko" = { + memory = "4Gi" + cpu = "2" + concurrency = "1" + timeout = "900" # 15m + } + "mirror" = { + memory = "1Gi" + cpu = "1" + concurrency = "80" + timeout = "60" # 1m + } + "mirror" = { + memory = "1Gi" + cpu = "1" + concurrency = "80" + timeout = "60" # 1m + } + "random" = { + memory = "1Gi" + cpu = "1" + concurrency = "80" + timeout = "60" # 1m + } + "viz" = { + memory = "1Gi" + cpu = "1" + concurrency = "80" + timeout = "60" # 1m + } + "wait" = { + memory = "1Gi" + cpu = "1" + concurrency = "80" + timeout = "60" # 1m + } + } } ////// Cloud Storage @@ -79,7 +135,7 @@ resource "google_app_engine_application" "app" { } resource "google_cloud_tasks_queue" "wait-queue" { - name = "wait-queue" + name = "wait-queue" location = var.region depends_on = [google_project_service.cloudtasks, google_app_engine_application.app]