diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cf47a08df4a3103b53b99ecbe0d25963c5c545f..082c6e97ff31d90274e3aa7063c1bf2d840d36fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,10 +17,10 @@ default: - 1cpu-4gb # build on smaller machine build_docker: - image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:27' + image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:28' stage: "build" services: - - name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:27-dind' + - name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:28-dind' alias: 'docker' variables: # this could be fetched via terraform output ("gcr_location" in infra project), but then we would need an extra job for terraform @@ -43,7 +43,7 @@ build_docker: .deploy: stage: "deploy" image: - name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.10.5' + name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.11.0' # default entrypoint is terraform command, but we want to run shell scripts entrypoint: ["/bin/sh", "-c"] variables: diff --git a/.terraform-version b/.terraform-version index db77e0ee9760ad2a1d6af56399723c47e18fcf18..1cac385c6cb864bab53f6846e112f5a93fd17401 100644 --- a/.terraform-version +++ b/.terraform-version @@ -1 +1 @@ -1.10.5 +1.11.0 diff --git a/terraform/common/init.tf b/terraform/common/init.tf index 38ef379ba7e999b2d7556bf1213bcf77e24657b7..cfe77da9ee716054b10dd1574a57c2b0b10dc6a2 100644 --- a/terraform/common/init.tf +++ b/terraform/common/init.tf @@ -4,11 +4,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "6.22.0" + version = "6.24.0" } google-beta = { source = "hashicorp/google-beta" - version = "6.22.0" + version = "6.24.0" } } backend "gcs" { diff --git a/terraform/environments/init.tf b/terraform/environments/init.tf index 845e8ded16162efcaadb4c215e8f76aa5e83dc91..56fdd63cc92c6018df55593fe05a97e37781fa96 100644 --- a/terraform/environments/init.tf +++ b/terraform/environments/init.tf @@ -4,11 +4,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "6.22.0" + version = "6.24.0" } google-beta = { source = "hashicorp/google-beta" - version = "6.22.0" + version = "6.24.0" } } backend "gcs" {