From ab768d60f75840ef4029afd9246c06906b77f614 Mon Sep 17 00:00:00 2001 From: ww24 Date: Sun, 1 Feb 2026 02:14:46 +0900 Subject: [PATCH] fix(terraform): container resources --- terraform/.terraform.lock.hcl | 56 +++++++++++++++---------------- terraform/access_log.tf | 6 ++-- terraform/cloud_run_screenshot.tf | 2 +- terraform/terraform.tf | 6 ++-- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index 1d61b2bc..bdb6f91f 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -2,41 +2,41 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "6.1.0" - constraints = "~> 6.1.0" + version = "7.17.0" + constraints = "~> 7.17.0" hashes = [ - "h1:YsgLN56yPU9lhNzJ/+Ag52BSYzwVrFAdObd0QM5bJHg=", - "zh:2463510438c97c59e06ab1fb1ef76221c844abd1bc404c439401fc256e9928ab", - "zh:2afd9b76a81c51632bd54d3cc3bdc2685e8d89b8ace8ca7578b1ae42880228b5", - "zh:51e2fb64c7c8258ac0ec7315d488e5c655b392bf565f9bee2922ee72f6abfb90", - "zh:85aa39bad51132810ee6cd369f426614abff59cb0274fc737d087c17afa9b5ee", - "zh:989669bfed5ca7bf4d960eb9f27a62cbe2578ca2907da7c74fc93edae9a497fa", - "zh:a26665782e90ef3fd322d6a23a1de383c81ae93395e7c2bd9648a1aa85c69876", - "zh:d5e1b785b4c8569b91153eeba89280ffbbe7a0aaabb708833ada67544aeed057", - "zh:d748c69eab6acc4ab7ec369b3bd3ddd5d2e4120d99570743dafde74934959a20", - "zh:eb853ab5c4c0d3e536b8c77abf844b7893ac355967c95b6e0d39b12526e67989", - "zh:f4b50f0ae082412ba189041b6ac540523b7d6463905fed63be67eec03e1539b9", + "h1:H1S4A4WeB7Phd2wN7q5OMV8MVNFgp7su5Og83oBJFlI=", + "zh:103778d776fb994a6b24d70fa095c23a1672361f2a05d882b227b02507b402fc", + "zh:34bcd6cce3081a21983ccfad5cbf2cbf69ff298c65c6570edb4ec7d38a8183f5", + "zh:5f8fd0e8e40068b597b28c0bc08372c9228aad77746068101c72acf4bb902937", + "zh:6b25cee7dec78470feb987438aedb1f4354c696f6548edee7775621e8df24fa9", + "zh:6b5bd97884b51b86fa6a9f1905c0ebf695539e905122052896e8b05122416ff4", + "zh:86e634c5825d8bd32592ae6b74f15e1db5d9b61c85d1a2e529d1696effb76d54", + "zh:c3190609f6f638f4efd7359a5638eeff81d41a38a00861f7df870b5c8f4c11cb", + "zh:d42d854642b4d3b010f232d848197945f90af60e7f9883ac96d7caae9c9d2474", + "zh:da9929be5d3873ad317e488e7ada08d5b95b5461b34d91cef76314317bdc0d49", + "zh:ed2763c21b2f3c1eb7b4b92f6502069a24078345e19c88f91d9e3a46a17147f8", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f6e7adcfafe267d9c657a6c087388f7e0c1e3be4dc179a9a823f75c830a499b7", + "zh:fbca63b82bbdef6fd329d2c8356b3f39f8c785ad93fd0596cfff676dbaef23ac", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "6.1.0" - constraints = "~> 6.1.0" + version = "7.17.0" + constraints = "~> 7.17.0" hashes = [ - "h1:tD73XC7iMl+8T6GeMhBaJJVs/a4QGqVLeu7q0wswfRE=", - "zh:3ea706aa701755ed212a13ebfc0332a587738add77f7433449ec0b0bde9ba6f3", - "zh:5025a74240983a7a55c1496b124da4193f23dec751dec203e1801439e6c232af", - "zh:535fe811841e7ce06050b66f4d32d5812df17cf942c15d3063c8d29197733938", - "zh:66e81f66c2bc4e2d325b537f9e9e51ea4ca4d1015b8c7ee8bdca74c6fc1f41b6", - "zh:71ebb3ba56666ba38424acebb5b149df10cb31f68e268e7be6ec66046c9e83b3", - "zh:8c798beb2516f726324289a06eb6956c88905c2a385e4cf18830c5210d9abc64", - "zh:9110f27d1c5cf2b797162c17ab75c47c856f8273fb66dbf26b3d2fe5b1a9b105", - "zh:a85f6ed96ade11563eaa3c8ab25e36c4a8abea8f3de2c59a2a318a110903d110", - "zh:aec1733cbe018418f62182b06f982ecaa32888398f93072cf5300523e9c6763d", - "zh:b58eb8b422eb6c576f1b597c1bcda618ef143d6acc9663730e9b4ce55e035814", - "zh:b5984d64c9bf7ac5e27b9fdbcc44fd206b320259007b5c7fc6e3c975b0762478", + "h1:Lvy8SNxU3Pd7kptEO90cCife/UdnuUrFzzMW15oD8V8=", + "zh:1946fc6380332fbaed8d8183ab97212562ab716d41e704cde3fff7690dd3c9f5", + "zh:2fce3e2316f8e1a6ef9619f928226d265ac0774de35d47e9ecbccc5468994e90", + "zh:4c1ec6d2a81ea6f88d0506fa341b5215f01160c023276c3967368239b37d73a5", + "zh:63fe27898d521f05cc70814fd3afebd338a2075e4ee16458b56bc40ec2457e30", + "zh:677272077d97656a7df71fb5d968bf157ab6397658e9268b2030876d1722bfb3", + "zh:9113e7710b122ca6ec965f814867cb086f40e61f33175201ac56228067c38751", + "zh:9ca95716a7fec0135e329c108986e0a045f52285e171e70e4e962e4d1e78e3e0", + "zh:bdf4ce9fb1351539eab2e3474c172344eb64fabea3ec236cc9d3374451063369", + "zh:cb302f7e0423e384d9456121b5f05c6ddab8bde050a4cde130d87ab4ff199d0e", + "zh:d22c2340edc6d261c78d27ba5f90e65442366d31645a1a35fb33071c33e5b770", + "zh:e470bcbcc51afbb9f98b4a398e2e6d94700c77f151e5d4067352fc4722b6444b", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } diff --git a/terraform/access_log.tf b/terraform/access_log.tf index c4e52339..5d65fb8b 100644 --- a/terraform/access_log.tf +++ b/terraform/access_log.tf @@ -170,15 +170,15 @@ resource "google_cloud_run_v2_job" "maxmind" { template { service_account = google_service_account.maxmind.email timeout = "60s" - max_retries = 3 + max_retries = 1 containers { - image = "us.gcr.io/google.com/cloudsdktool/google-cloud-cli:412.0.0-alpine" + image = "us.gcr.io/google.com/cloudsdktool/google-cloud-cli:554.0.0-alpine" resources { limits = { cpu = "1000m" # minimum - memory = "512Mi" # minimum + memory = "1Gi" # minimum } } diff --git a/terraform/cloud_run_screenshot.tf b/terraform/cloud_run_screenshot.tf index 21331f6c..d03ae5cc 100644 --- a/terraform/cloud_run_screenshot.tf +++ b/terraform/cloud_run_screenshot.tf @@ -17,7 +17,7 @@ resource "google_cloud_run_v2_job" "screenshot" { resources { limits = { cpu = "1000m" # minimum - memory = "1Gi" + memory = "512Mi" } } diff --git a/terraform/terraform.tf b/terraform/terraform.tf index f2297fce..27c6ab6c 100644 --- a/terraform/terraform.tf +++ b/terraform/terraform.tf @@ -1,14 +1,14 @@ terraform { - required_version = "~> 1.5.7" + required_version = "~> 1.14.0" required_providers { google = { source = "hashicorp/google" - version = "~> 6.1.0" + version = "~> 7.17.0" } google-beta = { source = "hashicorp/google-beta" - version = "~> 6.1.0" + version = "~> 7.17.0" } }