rebase

terraform-google-modules · Jun 5, 2023 · 9425ab3 · 9425ab3
1 parent 8693667
commit 9425ab3
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 48 deletions.
diff --git a/modules/beta-autopilot-private-cluster/versions.tf b/modules/beta-autopilot-private-cluster/versions.tf
@@ -21,19 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-<<<<<<< HEAD
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
-=======
-      version = ">= 4.63.0, < 5.0"
-    }
-    google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 4.63.0, < 5.0"
->>>>>>> c27c19db (feat: Add protect_config to beta clusters)
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/modules/beta-autopilot-public-cluster/versions.tf b/modules/beta-autopilot-public-cluster/versions.tf
@@ -21,19 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-<<<<<<< HEAD
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
-=======
-      version = ">= 4.63.0, < 5.0"
-    }
-    google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 4.63.0, < 5.0"
->>>>>>> c27c19db (feat: Add protect_config to beta clusters)
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -21,19 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-<<<<<<< HEAD
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
-=======
-      version = ">= 4.63.0, < 5.0"
-    }
-    google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 4.63.0, < 5.0"
->>>>>>> c27c19db (feat: Add protect_config to beta clusters)
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -21,19 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-<<<<<<< HEAD
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
-=======
-      version = ">= 4.63.0, < 5.0"
-    }
-    google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 4.63.0, < 5.0"
->>>>>>> c27c19db (feat: Add protect_config to beta clusters)
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf
@@ -21,19 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-<<<<<<< HEAD
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
-=======
-      version = ">= 4.63.0, < 5.0"
-    }
-    google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 4.63.0, < 5.0"
->>>>>>> c27c19db (feat: Add protect_config to beta clusters)
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -21,19 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-<<<<<<< HEAD
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
       version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
-=======
-      version = ">= 4.63.0, < 5.0"
-    }
-    google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 4.63.0, < 5.0"
->>>>>>> c27c19db (feat: Add protect_config to beta clusters)
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"