terraform: upgrade hashicorp/google to 6.7.0 (#3440)

edgelesssys · Oct 21, 2024 · 96ac712 · 96ac712
1 parent 0997ce2
commit 96ac712
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 127 deletions.
diff --git a/terraform/infrastructure/gcp/.terraform.lock.hcl b/terraform/infrastructure/gcp/.terraform.lock.hcl
diff --git a/terraform/infrastructure/gcp/main.tf b/terraform/infrastructure/gcp/main.tf
@@ -2,12 +2,7 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = "5.37.0"
- }
-
- google-beta = {
- source = "hashicorp/google-beta"
- version = "5.37.0"
+ version = "6.7.0"
  }
 
  random = {
@@ -23,12 +18,6 @@ provider "google" {
  zone = var.zone
 }
 
-provider "google-beta" {
- project = var.project
- region = var.region
- zone = var.zone
-}
-
 locals {
  uid = random_id.uid.hex
  name = "${var.name}-${local.uid}"
@@ -91,12 +80,10 @@ resource "google_compute_subnetwork" "vpc_subnetwork" {
  description = "Constellation VPC subnetwork"
  network = google_compute_network.vpc_network.id
  ip_cidr_range = local.cidr_vpc_subnet_nodes
- secondary_ip_range = [
- {
- range_name = local.name,
- ip_cidr_range = local.cidr_vpc_subnet_pods,
- }
- ]
+ secondary_ip_range {
+ range_name = local.name
+ ip_cidr_range = local.cidr_vpc_subnet_pods
+ }
 }
 
 resource "google_compute_subnetwork" "proxy_subnet" {

diff --git a/terraform/infrastructure/gcp/modules/instance_group/main.tf b/terraform/infrastructure/gcp/modules/instance_group/main.tf
@@ -2,12 +2,7 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = "5.37.0"
- }
-
- google-beta = {
- source = "hashicorp/google-beta"
- version = "5.37.0"
+ version = "6.7.0"
  }
 
  random = {
@@ -28,10 +23,6 @@ resource "random_id" "uid" {
 }
 
 resource "google_compute_instance_template" "template" {
- # Beta provider is necessary to set confidential instance types.
- # TODO(msanft): Remove beta provider once confidential instance type setting is in GA.
- provider = google-beta
-
  name = local.name
  machine_type = var.instance_type
  tags = ["constellation-${var.uid}"] // Note that this is also applied as a label

diff --git a/terraform/infrastructure/gcp/modules/internal_load_balancer/main.tf b/terraform/infrastructure/gcp/modules/internal_load_balancer/main.tf
@@ -2,7 +2,7 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = "5.37.0"
+ version = "6.7.0"
  }
  }
 }

diff --git a/terraform/infrastructure/gcp/modules/jump_host/main.tf b/terraform/infrastructure/gcp/modules/jump_host/main.tf
@@ -2,7 +2,7 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = "5.37.0"
+ version = "6.7.0"
  }
  }
 }

diff --git a/terraform/infrastructure/gcp/modules/loadbalancer/main.tf b/terraform/infrastructure/gcp/modules/loadbalancer/main.tf
@@ -2,7 +2,7 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = "5.37.0"
+ version = "6.7.0"
  }
  }
 }

diff --git a/terraform/infrastructure/iam/gcp/.terraform.lock.hcl b/terraform/infrastructure/iam/gcp/.terraform.lock.hcl
diff --git a/terraform/infrastructure/iam/gcp/main.tf b/terraform/infrastructure/iam/gcp/main.tf
@@ -2,7 +2,7 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = "5.37.0"
+ version = "6.7.0"
  }
  }
 }