diff --git a/modules/beta-autopilot-private-cluster/versions.tf b/modules/beta-autopilot-private-cluster/versions.tf index 2b22c5356f..48c66f49c7 100644 --- 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 index 130e5a41db..222893ba2b 100644 --- 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 index 84834a2849..d3830965ed 100644 --- 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 index bca1974760..3e2272062c 100644 --- 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 index a46e9210a1..e1fec308d0 100644 --- 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 index 64d8d7225b..09e30992d8 100644 --- 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"