Skip to content

Commit

Permalink
Update Google providers to v5 (#1907)
Browse files Browse the repository at this point in the history
* Bump Google providers to v5

* Bump tf providers and modules

* Bump tf providers and modules

* Bump tf providers and modules
  • Loading branch information
bourgeoisor committed Nov 6, 2023
1 parent f4179b8 commit 9d38b6e
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion iac/tf-anthos-gke/acm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "acm" {
source = "terraform-google-modules/kubernetes-engine/google//modules/acm"
version = "~> 28.0"
version = "~> 29.0"
project_id = data.google_project.project.project_id
location = module.gke.location
cluster_name = module.gke.name
Expand Down
2 changes: 1 addition & 1 deletion iac/tf-anthos-gke/asm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "asm" {
source = "terraform-google-modules/kubernetes-engine/google//modules/asm"
version = "~> 28.0"
version = "~> 29.0"
project_id = data.google_project.project.project_id
cluster_name = module.gke.name
cluster_location = module.gke.location
Expand Down
3 changes: 2 additions & 1 deletion iac/tf-anthos-gke/gke.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google"
version = "~> 28.0"
version = "~> 29.0"
project_id = data.google_project.project.project_id
name = var.cluster_name
region = var.region
Expand All @@ -31,6 +31,7 @@ module "gke" {
"mesh_id" : "proj-${data.google_project.project.number}",
}
identity_namespace = "${data.google_project.project.project_id}.svc.id.goog"
deletion_protection = false

node_pools = [
{
Expand Down
2 changes: 1 addition & 1 deletion iac/tf-anthos-gke/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ data "google_client_config" "default" {}

module "enabled_google_apis" {
source = "terraform-google-modules/project-factory/google//modules/project_services"
version = "~> 14.0"
version = "~> 14.4.0"

project_id = data.google_project.project.project_id
disable_services_on_destroy = false
Expand Down
4 changes: 2 additions & 2 deletions iac/tf-anthos-gke/providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.0"
version = "~> 5.4"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.0"
version = "~> 5.4"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion iac/tf-multienv-cicd-anthos-autopilot/apis.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

module "enabled_google_apis" {
source = "terraform-google-modules/project-factory/google//modules/project_services"
version = "~> 14.0"
version = "~> 14.4.0"

project_id = var.project_id
disable_services_on_destroy = false
Expand Down
1 change: 1 addition & 0 deletions iac/tf-multienv-cicd-anthos-autopilot/env-development.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ provider "kubernetes" {
# development autopilot cluster
module "gke_development" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
version = "29.0.0"

project_id = var.project_id
name = "development"
Expand Down
1 change: 1 addition & 0 deletions iac/tf-multienv-cicd-anthos-autopilot/env-production.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ provider "kubernetes" {
# production autopilot cluster
module "gke_production" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
version = "29.0.0"

project_id = var.project_id
name = "production"
Expand Down
1 change: 1 addition & 0 deletions iac/tf-multienv-cicd-anthos-autopilot/env-staging.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ provider "kubernetes" {
# staging autopilot cluster
module "gke_staging" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
version = "29.0.0"

project_id = var.project_id
name = "staging"
Expand Down
2 changes: 1 addition & 1 deletion iac/tf-multienv-cicd-anthos-autopilot/network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# explicit setup of VPC & subnets for GKE resources
module "network" {
source = "terraform-google-modules/network/google"
version = "< 8.0.0"
version = "~> 8.0.0"

project_id = var.project_id
network_name = local.network_name
Expand Down

0 comments on commit 9d38b6e

Please sign in to comment.