diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5670f8aa60d135eb697634b7e85c3732c497c44b..3bfbfdd0ba2ea1b44dc990a2a5d026679e32059d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: .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: @@ -72,9 +72,9 @@ include: build_docker: needs: ['cache_lint_test'] - 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' 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 @@ -112,7 +112,7 @@ review_smoketest: review_destroy: needs: ['review_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 da4b15f04aa1936ae2d1f52029f2e4f8d67cdf46..b21be3d206689718aa4b7ebb20554072e0e7a3d0 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 5372296d3175ef38dbc3f1632da3ed5c86de085e..25abafa265671f10fd6add3766574c6ec6875f7a 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" {