Merge branch 'main' into main

hashicorp · Oct 11, 2023 · 9ea122c · 9ea122c
2 parents bd29240 + 1ddc122
commit 9ea122c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/_about/FAQ.md b/_about/FAQ.md
@@ -4,7 +4,7 @@
 
 The HashiCorp Terraform Kubernetes provider team is :
 
-* Tejitha Raju, Product Manager - [@tejavar](https://github.com/tejavar)
+* Vishnu Ravindra, Product Manager - [@vravind1](https://github.com/vravind1)
 * Alex Somesan, Engineer - [@alexsomesan](https://github.com/alexsomesan)
 * John Houston, Engineer - [@jrhouston](https://github.com/jrhouston)
 * Sacha Rybolovlev, Engineer - [@arybolovlev](https://github.com/arybolovlev)

diff --git a/kubernetes/test-infra/gke/main.tf b/kubernetes/test-infra/gke/main.tf
@@ -76,6 +76,8 @@ resource "google_container_cluster" "primary" {
       ]
     }
   }
+
+  deletion_protection = false
 }
 
 locals {

diff --git a/kubernetes/test-infra/gke/versions.tf b/kubernetes/test-infra/gke/versions.tf
@@ -3,5 +3,12 @@
 
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 1.0"
+
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 5.0.0, < 6.0.0"
+    }
+  }
 }