diff --git a/terraform/api/gcp/main.tf b/terraform/api/gcp/main.tf index 4875764..04bcc46 100644 --- a/terraform/api/gcp/main.tf +++ b/terraform/api/gcp/main.tf @@ -3,7 +3,7 @@ terraform { } provider "google" { - version = "~> 2.12" + version = "~> 3.5.0" } provider "kubernetes" { diff --git a/terraform/cluster/gcp/main.tf b/terraform/cluster/gcp/main.tf index 3f88db3..cc06ade 100644 --- a/terraform/cluster/gcp/main.tf +++ b/terraform/cluster/gcp/main.tf @@ -1,13 +1,9 @@ -terraform { - required_version = ">= 0.12.0" -} - provider "google" { - version = "~> 2.19" + version = "~> 3.5.0" } provider "google-beta" { - version = "~> 2.19" + version = "~> 3.5.0" } provider "local" { @@ -20,11 +16,6 @@ provider "random" { data "google_client_config" "current" {} -data "google_container_engine_versions" "available" { - location = data.google_client_config.current.region - version_prefix = "1.14." -} - data "google_project" "current" {} resource "random_string" "password" { @@ -41,8 +32,10 @@ resource "google_container_cluster" "rack" { remove_default_node_pool = true initial_node_count = 1 - logging_service = "logging.googleapis.com" - min_master_version = data.google_container_engine_versions.available.latest_master_version + + release_channel { + channel = "REGULAR" + } workload_identity_config { identity_namespace = "${data.google_project.current.project_id}.svc.id.goog" @@ -67,7 +60,6 @@ resource "google_container_node_pool" "rack" { location = google_container_cluster.rack.location cluster = google_container_cluster.rack.name initial_node_count = 1 - version = data.google_container_engine_versions.available.latest_master_version autoscaling { min_node_count = 1 diff --git a/terraform/rack/gcp/main.tf b/terraform/rack/gcp/main.tf index 71439ba..d4af5ac 100644 --- a/terraform/rack/gcp/main.tf +++ b/terraform/rack/gcp/main.tf @@ -1,10 +1,5 @@ - -terraform { - required_version = ">= 0.12.0" -} - provider "google" { - version = "~> 2.12" + version = "~> 3.5.0" } provider "kubernetes" { diff --git a/terraform/router/gcp/main.tf b/terraform/router/gcp/main.tf index dd97ab3..c8aa93a 100644 --- a/terraform/router/gcp/main.tf +++ b/terraform/router/gcp/main.tf @@ -1,9 +1,5 @@ -terraform { - required_version = ">= 0.12.0" -} - provider "google" { - version = "~> 2.12" + version = "~> 3.5.0" } provider "http" { diff --git a/terraform/system/gcp/main.tf b/terraform/system/gcp/main.tf index c0415be..4b92da5 100644 --- a/terraform/system/gcp/main.tf +++ b/terraform/system/gcp/main.tf @@ -3,14 +3,14 @@ terraform { } provider "google" { - version = "~> 2.19" + version = "~> 3.5.0" project = module.project.id region = module.project.region } provider "google-beta" { - version = "~> 2.19" + version = "~> 3.5.0" project = module.project.id region = module.project.region diff --git a/terraform/system/gcp/project/main.tf b/terraform/system/gcp/project/main.tf index a34ee5f..da8a05a 100644 --- a/terraform/system/gcp/project/main.tf +++ b/terraform/system/gcp/project/main.tf @@ -1,5 +1,5 @@ provider "google" { - version = "~> 2.18" + version = "~> 3.5.0" alias = "direct" }