remove google-beta provider as all features are in core provider now (#…

…1293) Signed-off-by: Bob Callaway <bcallaway@google.com>
sigstore · Oct 6, 2024 · 3b6febc · 3b6febc
1 parent 9681b02
commit 3b6febc
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 23 deletions.
diff --git a/terraform/gcp/modules/bastion/README.md b/terraform/gcp/modules/bastion/README.md
@@ -15,7 +15,6 @@ restricted to a given, private Kubernetes API endpoint.
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.1.3, < 1.2.0 |
 | <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.11.0, < 4.12.0 |
-| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.11.0, < 4.12.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0, < 3.2.0 |
 
 ## Providers
@@ -33,13 +32,13 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [google_compute_firewall.bastion-egress](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/compute_firewall) | resource |
-| [google_compute_firewall.bastion-ingress](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/compute_firewall) | resource |
-| [google_compute_instance.bastion](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/compute_instance) | resource |
-| [google_service_account.bastion](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/service_account) | resource |
+| [google_compute_firewall.bastion-egress](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_firewall) | resource |
+| [google_compute_firewall.bastion-ingress](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_firewall) | resource |
+| [google_compute_instance.bastion](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance) | resource |
+| [google_service_account.bastion](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/service_account) | resource |
 | [random_id.suffix](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id) | resource |
 | [random_shuffle.bastion_az](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/shuffle) | resource |
-| [google_compute_zones.available](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/data-sources/compute_zones) | data source |
+| [google_compute_zones.available](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_zones) | data source |
 
 ## Inputs
 

diff --git a/terraform/gcp/modules/bastion/examples/basic/main.tf b/terraform/gcp/modules/bastion/examples/basic/main.tf
@@ -18,10 +18,6 @@ provider "google" {
   project = var.project
 }
 
-provider "google-beta" {
-  project = var.project
-}
-
 module "bastion" {
   source = "./../../"
 

diff --git a/terraform/gcp/modules/gke_cluster/cluster.tf b/terraform/gcp/modules/gke_cluster/cluster.tf
@@ -36,7 +36,6 @@ resource "google_project_service" "service" {
 }
 
 resource "google_container_cluster" "cluster" {
-  provider = google-beta
   # This is where to enable Dataplane v2.
   datapath_provider = var.datapath_provider
 

diff --git a/terraform/gcp/modules/gke_cluster/versions.tf b/terraform/gcp/modules/gke_cluster/versions.tf
@@ -22,10 +22,6 @@ terraform {
       version = "6.5.0"
       source  = "hashicorp/google"
     }
-    google-beta = {
-      version = "6.3.0"
-      source  = "hashicorp/google-beta"
-    }
     random = {
       version = "3.6.3"
       source  = "hashicorp/random"

diff --git a/terraform/gcp/modules/sigstore/providers.tf b/terraform/gcp/modules/sigstore/providers.tf
@@ -19,7 +19,3 @@ provider "google" {
   region  = var.region
 }
 
-provider "google-beta" {
-  project = var.project_id
-  region  = var.region
-}
diff --git a/terraform/gcp/modules/sigstore/versions.tf b/terraform/gcp/modules/sigstore/versions.tf
@@ -22,9 +22,5 @@ terraform {
       version = "6.5.0"
       source  = "hashicorp/google"
     }
-    google-beta = {
-      version = "6.3.0"
-      source  = "hashicorp/google-beta"
-    }
   }
 }