Merge pull request #381 from bharathkkb/feature/provider-update

morgante · web-flow · commit e50430168b70 · 2019-12-27T16:37:38.000-05:00
Provider update 3.3.0
diff --git a/README.md b/README.md
@@ -115,7 +115,7 @@ Then perform the following commands on the root folder:
 |------|-------------|:----:|:-----:|:-----:|
 | basic\_auth\_password | The password to be used with Basic Authentication. | string | `""` | no |
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
-| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `""` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/autogen/main.tf.tmpl b/autogen/main.tf.tmpl
@@ -137,7 +137,7 @@ locals {
   cluster_master_auth_map         = local.cluster_master_auth_list_layer2[0]
 
   cluster_location = google_container_cluster.primary.location
-  cluster_region   = var.regional ? google_container_cluster.primary.region : join("-", slice(split("-", local.cluster_location), 0, 2))
+  cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
   cluster_name                               = local.cluster_output_name
diff --git a/autogen/variables.tf.tmpl b/autogen/variables.tf.tmpl
@@ -318,7 +318,7 @@ variable "issue_client_certificate" {
 }
 
 variable "cluster_ipv4_cidr" {
-  default     = ""
+  default     = null
   description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
 }
 
diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl
@@ -19,9 +19,9 @@ terraform {
 
   required_providers {
 {% if beta_cluster %}
-    google-beta = "~> 2.18"
+    google-beta = ">= 2.18, <4.0.0"
 {% else %}
-    google = "~> 2.18"
+    google = ">= 2.18, <4.0.0"
 {% endif %}
   }
 }
diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version     = "~> 2.18.0"
+  version     = "~> 3.3.0"
   credentials = file(var.credentials_path)
   region      = var.region
 }
diff --git a/examples/private_zonal_with_networking/main.tf b/examples/private_zonal_with_networking/main.tf
@@ -16,7 +16,7 @@
 
 module "gcp-network" {
   source       = "terraform-google-modules/network/google"
-  version      = "~> 1.4.0"
+  version      = "~> 2.0"
   project_id   = var.project_id
   network_name = var.network
 
diff --git a/examples/regional_private_node_pool_oauth_scopes/network.tf b/examples/regional_private_node_pool_oauth_scopes/network.tf
@@ -16,7 +16,7 @@
 
 module "gke-network" {
   source       = "terraform-google-modules/network/google"
-  version      = "~> 1.5"
+  version      = "~> 2.0"
   project_id   = var.project_id
   network_name = "random-gke-network"
 
diff --git a/examples/regional_private_node_pool_oauth_scopes/provider.tf b/examples/regional_private_node_pool_oauth_scopes/provider.tf
@@ -15,9 +15,9 @@
  */
 
 provider "google" {
-  version = "2.18.0"
+  version = "3.3.0"
 }
 
 provider "google-beta" {
-  version = "2.18.0"
+  version = "3.3.0"
 }
diff --git a/examples/safer_cluster/main.tf b/examples/safer_cluster/main.tf
@@ -23,18 +23,18 @@ resource "random_string" "suffix" {
 locals {
   cluster_type           = "safer-cluster"
   network_name           = "safer-cluster-network-${random_string.suffix.result}"
-  subnet_name            = "safer-cluster-subnet-${random_string.suffix.result}"
-  master_auth_subnetwork = "safer-cluster-master-subnet-${random_string.suffix.result}"
+  subnet_name            = "safer-cluster-subnet"
+  master_auth_subnetwork = "safer-cluster-master-subnet"
   pods_range_name        = "ip-range-pods-${random_string.suffix.result}"
   svc_range_name         = "ip-range-svc-${random_string.suffix.result}"
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
 }
 
 provider "google-beta" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
 }
 
 module "gke" {
@@ -44,7 +44,7 @@ module "gke" {
   regional                       = true
   region                         = var.region
   network                        = module.gcp-network.network_name
-  subnetwork                     = module.gcp-network.subnets_names[0]
+  subnetwork                     = module.gcp-network.subnets_names[index(module.gcp-network.subnets_names, local.subnet_name)]
   ip_range_pods                  = local.pods_range_name
   ip_range_services              = local.svc_range_name
   compute_engine_service_account = var.compute_engine_service_account
diff --git a/examples/safer_cluster/network.tf b/examples/safer_cluster/network.tf
@@ -16,7 +16,7 @@
 
 module "gcp-network" {
   source       = "terraform-google-modules/network/google"
-  version      = "~> 1.4.0"
+  version      = "~> 2.0"
   project_id   = var.project_id
   network_name = local.network_name
 
diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional_private_beta/main.tf b/examples/simple_regional_private_beta/main.tf
@@ -18,8 +18,13 @@ locals {
   cluster_type = "simple-regional-private-beta"
 }
 
+provider "google" {
+  version = "~> 3.3.0"
+  region  = var.region
+}
+
 provider "google-beta" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional_with_networking/main.tf b/examples/simple_regional_with_networking/main.tf
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
+provider "google" {
+  version = "~> 3.3.0"
+}
+
 module "gcp-network" {
   source       = "terraform-google-modules/network/google"
-  version      = "~> 1.4.0"
+  version      = "~> 2.0"
   project_id   = var.project_id
   network_name = var.network
 
diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/simple_zonal_with_acm/main.tf b/examples/simple_zonal_with_acm/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf
@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.18.0"
+  version = "~> 3.3.0"
   region  = var.region
 }
 
diff --git a/main.tf b/main.tf
@@ -92,7 +92,7 @@ locals {
   cluster_master_auth_map         = local.cluster_master_auth_list_layer2[0]
 
   cluster_location = google_container_cluster.primary.location
-  cluster_region   = var.regional ? google_container_cluster.primary.region : join("-", slice(split("-", local.cluster_location), 0, 2))
+  cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
   cluster_name                               = local.cluster_output_name
diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md
@@ -137,7 +137,7 @@ Then perform the following commands on the root folder:
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
 | cloudrun | (Beta) Enable CloudRun addon | string | `"false"` | no |
 | cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object | `<map>` | no |
-| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `""` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/modules/beta-private-cluster-update-variant/main.tf b/modules/beta-private-cluster-update-variant/main.tf
@@ -123,7 +123,7 @@ locals {
   cluster_master_auth_map         = local.cluster_master_auth_list_layer2[0]
 
   cluster_location = google_container_cluster.primary.location
-  cluster_region   = var.regional ? google_container_cluster.primary.region : join("-", slice(split("-", local.cluster_location), 0, 2))
+  cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
   cluster_name                               = local.cluster_output_name
diff --git a/modules/beta-private-cluster-update-variant/variables.tf b/modules/beta-private-cluster-update-variant/variables.tf
@@ -316,7 +316,7 @@ variable "issue_client_certificate" {
 }
 
 variable "cluster_ipv4_cidr" {
-  default     = ""
+  default     = null
   description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
 }
 
diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    google-beta = "~> 2.18"
+    google-beta = ">= 2.18, <4.0.0"
   }
 }
diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md
@@ -137,7 +137,7 @@ Then perform the following commands on the root folder:
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
 | cloudrun | (Beta) Enable CloudRun addon | string | `"false"` | no |
 | cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object | `<map>` | no |
-| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `""` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf
@@ -123,7 +123,7 @@ locals {
   cluster_master_auth_map         = local.cluster_master_auth_list_layer2[0]
 
   cluster_location = google_container_cluster.primary.location
-  cluster_region   = var.regional ? google_container_cluster.primary.region : join("-", slice(split("-", local.cluster_location), 0, 2))
+  cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
   cluster_name                               = local.cluster_output_name
diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf
@@ -316,7 +316,7 @@ variable "issue_client_certificate" {
 }
 
 variable "cluster_ipv4_cidr" {
-  default     = ""
+  default     = null
   description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
 }
 
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    google-beta = "~> 2.18"
+    google-beta = ">= 2.18, <4.0.0"
   }
 }
diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md
@@ -121,7 +121,7 @@ Then perform the following commands on the root folder:
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
 | cloudrun | (Beta) Enable CloudRun addon | string | `"false"` | no |
 | cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object | `<map>` | no |
-| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `""` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf
@@ -123,7 +123,7 @@ locals {
   cluster_master_auth_map         = local.cluster_master_auth_list_layer2[0]
 
   cluster_location = google_container_cluster.primary.location
-  cluster_region   = var.regional ? google_container_cluster.primary.region : join("-", slice(split("-", local.cluster_location), 0, 2))
+  cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
   cluster_name                               = local.cluster_output_name
diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf
@@ -316,7 +316,7 @@ variable "issue_client_certificate" {
 }
 
 variable "cluster_ipv4_cidr" {
-  default     = ""
+  default     = null
   description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
 }
 
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    google-beta = "~> 2.18"
+    google-beta = ">= 2.18, <4.0.0"
   }
 }
diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md
diff --git a/modules/private-cluster-update-variant/main.tf b/modules/private-cluster-update-variant/main.tf
diff --git a/modules/private-cluster-update-variant/variables.tf b/modules/private-cluster-update-variant/variables.tf
diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
diff --git a/modules/private-cluster/main.tf b/modules/private-cluster/main.tf
diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
diff --git a/modules/safer-cluster/main.tf b/modules/safer-cluster/main.tf
diff --git a/test/fixtures/deploy_service/network.tf b/test/fixtures/deploy_service/network.tf
diff --git a/test/fixtures/disable_client_cert/network.tf b/test/fixtures/disable_client_cert/network.tf
diff --git a/test/fixtures/shared_vpc/network.tf b/test/fixtures/shared_vpc/network.tf
diff --git a/test/fixtures/simple_regional/network.tf b/test/fixtures/simple_regional/network.tf
diff --git a/test/fixtures/simple_zonal/network.tf b/test/fixtures/simple_zonal/network.tf
diff --git a/test/fixtures/stub_domains/network.tf b/test/fixtures/stub_domains/network.tf
diff --git a/test/fixtures/stub_domains_upstream_nameservers/network.tf b/test/fixtures/stub_domains_upstream_nameservers/network.tf
diff --git a/test/fixtures/upstream_nameservers/network.tf b/test/fixtures/upstream_nameservers/network.tf
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
diff --git a/variables.tf b/variables.tf
diff --git a/versions.tf b/versions.tf

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ variable "issue_client_certificate" {`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`variable "cluster_ipv4_cidr" {`
`321`		`- default = ""`
	`321`	`+ default = null`
`322`	`322`	`description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."`
`323`	`323`	`}`
`324`	`324`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ terraform {`
`19`	`19`
`20`	`20`	`required_providers {`
`21`	`21`	`{% if beta_cluster %}`
`22`		`- google-beta = "~> 2.18"`
	`22`	`+ google-beta = ">= 2.18, <4.0.0"`
`23`	`23`	`{% else %}`
`24`		`- google = "~> 2.18"`
	`24`	`+ google = ">= 2.18, <4.0.0"`
`25`	`25`	`{% endif %}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google" {`
`22`		`- version = "~> 2.18.0"`
	`22`	`+ version = "~> 3.3.0"`
`23`	`23`	`region = var.region`
`24`	`24`	`}`
`25`	`25`