From 8e03075237c3e7f29a50cdd7e903f2e1919841d8 Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Fri, 21 Apr 2023 10:18:32 +1000 Subject: [PATCH 1/2] feat: update setup job to match new variable Introduced in https://github.com/GoogleCloudPlatform/avocano/pull/179 --- infra/jobs.tf | 2 +- infra/variables.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/jobs.tf b/infra/jobs.tf index 6302f206..ae72982e 100644 --- a/infra/jobs.tf +++ b/infra/jobs.tf @@ -36,7 +36,7 @@ resource "google_cloud_run_v2_job" "setup" { } } env { - name = "ADMIN_PASSWORD" + name = "DJANGO_SUPERUSER_PASSWORD" value_source { secret_key_ref { secret = google_secret_manager_secret.django_admin_password.secret_id diff --git a/infra/variables.tf b/infra/variables.tf index eb5ca30c..10a83a3b 100644 --- a/infra/variables.tf +++ b/infra/variables.tf @@ -55,7 +55,7 @@ variable "init" { variable "image_version" { type = string - default = "v1.5.0" + default = "v1.6.0" description = "Version of the Container Registry image to use" } From e699bfe52da72d12a5e86c9ccddb2c6e3bcb0ccf Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Fri, 21 Apr 2023 13:27:49 +1000 Subject: [PATCH 2/2] fix: update default image_version --- infra/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/README.md b/infra/README.md index 01e37d9e..9251eae2 100644 --- a/infra/README.md +++ b/infra/README.md @@ -47,7 +47,7 @@ Functional examples are included in the | client\_image\_host | Container Registry that hosts the client image (PROJECT\_ID[/folder]) | `string` | `"hsa-public/terraform-python-dynamic-webapp"` | no | | database\_name | Cloud SQL database name | `string` | `"django"` | no | | database\_username | Cloud SQL database name | `string` | `"server"` | no | -| image\_version | Version of the Container Registry image to use | `string` | `"v1.5.0"` | no | +| image\_version | Version of the Container Registry image to use | `string` | `"v1.6.0"` | no | | init | Initialize database? | `bool` | `true` | no | | instance\_name | Cloud SQL Instance name | `string` | `"psql"` | no | | labels | A set of key/value label pairs to assign to the resources deployed by this blueprint. | `map(string)` | `{}` | no |