Added support for resource usage export config

paulpalamarchuk · paulpalamarchuk · commit 8cbc1d0cf7e7 · 2019-08-21T17:25:51.000+03:00
* Based on PR #230 * Add support for beta feature resource_usage_export_config (Fixes #232) * Fixed `google-beta` provider version
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Extending the adopted spec, each change should have a link to its corresponding
 ## [Unreleased]
 ### Added
 
+* Added support for resource usage export config [#238]
 * Support for Intranode Visbiility (IV) and Veritical Pod Autoscaling (VPA) beta features [#216]
 * Support for Workload Identity beta feature [#234]
 
@@ -168,6 +169,7 @@ Extending the adopted spec, each change should have a link to its corresponding
 [v0.3.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.2.0...v0.3.0
 [v0.2.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.1.0...v0.2.0
 
+[#238]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/238
 [#234]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/234
 [#216]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/216
 [#214]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/214
diff --git a/autogen/cluster.tf b/autogen/cluster.tf
@@ -66,12 +66,13 @@ resource "google_container_cluster" "primary" {
       enabled = pod_security_policy_config.value.enabled
     }
   }
+
   dynamic "resource_usage_export_config" {
     for_each = var.resource_usage_export_dataset_id != "" ? [var.resource_usage_export_dataset_id] : []
     content {
       enable_network_egress_metering = true
       bigquery_destination {
-        dataset_id = resource_usage_export_dataset_id.value
+        dataset_id = resource_usage_export_config.value
       }
     }
   }
diff --git a/autogen/main.tf b/autogen/main.tf
@@ -98,10 +98,10 @@ locals {
 
 {% if beta_cluster %}
   # BETA features
-  cluster_output_istio_enabled                    = google_container_cluster.primary.addons_config.0.istio_config != null ? google_container_cluster.primary.addons_config.0.istio_config.0.disabled : "true"
-  cluster_output_pod_security_policy_enabled      = google_container_cluster.primary.pod_security_policy_config != null ? google_container_cluster.primary.pod_security_policy_config.0.enabled : "false"
+  cluster_output_istio_enabled                    = google_container_cluster.primary.addons_config.0.istio_config.0.disabled
+  cluster_output_pod_security_policy_enabled      = google_container_cluster.primary.pod_security_policy_config.0.enabled
   cluster_output_intranode_visbility_enabled      = google_container_cluster.primary.enable_intranode_visibility
-  cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null ? google_container_cluster.primary.vertical_pod_autoscaling.0.enabled : "false"
+  cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling.0.enabled
 
   # /BETA features
   {% endif %}
diff --git a/autogen/variables.tf b/autogen/variables.tf
@@ -361,6 +361,7 @@ variable "pod_security_policy_config" {
 }
 
 variable "resource_usage_export_dataset_id" {
+  type        = string
   description = "The dataset id for which network egress metering for this cluster will be enabled. If enabled, a daemonset will be created in the cluster to meter network egress traffic."
   default     = ""
 }
diff --git a/autogen/versions.tf b/autogen/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+  required_providers {
+    google-beta = "~> 2.12.0"
+    google      = "~> 2.12.0"
+  }
 }
diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "kubernetes" {
diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 module "gke" {
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 module "gke" {
diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 module "gke" {
diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 module "gke" {
diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 2.12.0"
   credentials = file(var.credentials_path)
   region      = var.region
 }
 
 provider "google-beta" {
-  version     = "~> 2.12.0"
   credentials = file(var.credentials_path)
   region      = var.region
 }
diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
@@ -19,8 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 data "google_compute_subnetwork" "subnetwork" {
diff --git a/examples/simple_regional_private_beta/main.tf b/examples/simple_regional_private_beta/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google-beta" {
-  version     = "~> 2.12.0"
   credentials = file(var.credentials_path)
   region      = var.region
 }
diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 module "gke" {
diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf
@@ -19,8 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 data "google_compute_subnetwork" "subnetwork" {
diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 module "gke" {
diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf
@@ -15,8 +15,7 @@
  */
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "random" {
diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 module "gke" {
diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf
@@ -19,13 +19,11 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 module "gke" {
diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf
@@ -19,8 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
-  region  = var.region
+  region = var.region
 }
 
 data "google_compute_subnetwork" "subnetwork" {
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -61,12 +61,13 @@ resource "google_container_cluster" "primary" {
       enabled = pod_security_policy_config.value.enabled
     }
   }
+
   dynamic "resource_usage_export_config" {
     for_each = var.resource_usage_export_dataset_id != "" ? [var.resource_usage_export_dataset_id] : []
     content {
       enable_network_egress_metering = true
       bigquery_destination {
-        dataset_id = resource_usage_export_dataset_id.value
+        dataset_id = resource_usage_export_config.value
       }
     }
   }
diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf
@@ -87,10 +87,10 @@ locals {
   cluster_output_kubernetes_dashboard_enabled       = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled
 
   # BETA features
-  cluster_output_istio_enabled                    = google_container_cluster.primary.addons_config.0.istio_config != null ? google_container_cluster.primary.addons_config.0.istio_config.0.disabled : "true"
-  cluster_output_pod_security_policy_enabled      = google_container_cluster.primary.pod_security_policy_config != null ? google_container_cluster.primary.pod_security_policy_config.0.enabled : "false"
+  cluster_output_istio_enabled                    = google_container_cluster.primary.addons_config.0.istio_config.0.disabled
+  cluster_output_pod_security_policy_enabled      = google_container_cluster.primary.pod_security_policy_config.0.enabled
   cluster_output_intranode_visbility_enabled      = google_container_cluster.primary.enable_intranode_visibility
-  cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null ? google_container_cluster.primary.vertical_pod_autoscaling.0.enabled : "false"
+  cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling.0.enabled
 
   # /BETA features
 
diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf
@@ -358,6 +358,7 @@ variable "pod_security_policy_config" {
 }
 
 variable "resource_usage_export_dataset_id" {
+  type        = string
   description = "The dataset id for which network egress metering for this cluster will be enabled. If enabled, a daemonset will be created in the cluster to meter network egress traffic."
   default     = ""
 }
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+  required_providers {
+    google-beta = "~> 2.12.0"
+    google      = "~> 2.12.0"
+  }
 }
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -61,12 +61,13 @@ resource "google_container_cluster" "primary" {
       enabled = pod_security_policy_config.value.enabled
     }
   }
+
   dynamic "resource_usage_export_config" {
     for_each = var.resource_usage_export_dataset_id != "" ? [var.resource_usage_export_dataset_id] : []
     content {
       enable_network_egress_metering = true
       bigquery_destination {
-        dataset_id = resource_usage_export_dataset_id.value
+        dataset_id = resource_usage_export_config.value
       }
     }
   }
diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf
@@ -87,10 +87,10 @@ locals {
   cluster_output_kubernetes_dashboard_enabled       = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled
 
   # BETA features
-  cluster_output_istio_enabled                    = google_container_cluster.primary.addons_config.0.istio_config != null ? google_container_cluster.primary.addons_config.0.istio_config.0.disabled : "true"
-  cluster_output_pod_security_policy_enabled      = google_container_cluster.primary.pod_security_policy_config != null ? google_container_cluster.primary.pod_security_policy_config.0.enabled : "false"
+  cluster_output_istio_enabled                    = google_container_cluster.primary.addons_config.0.istio_config.0.disabled
+  cluster_output_pod_security_policy_enabled      = google_container_cluster.primary.pod_security_policy_config.0.enabled
   cluster_output_intranode_visbility_enabled      = google_container_cluster.primary.enable_intranode_visibility
-  cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null ? google_container_cluster.primary.vertical_pod_autoscaling.0.enabled : "false"
+  cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling.0.enabled
 
   # /BETA features
 
diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf
@@ -334,6 +334,7 @@ variable "pod_security_policy_config" {
 }
 
 variable "resource_usage_export_dataset_id" {
+  type        = string
   description = "The dataset id for which network egress metering for this cluster will be enabled. If enabled, a daemonset will be created in the cluster to meter network egress traffic."
   default     = ""
 }
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+  required_providers {
+    google-beta = "~> 2.12.0"
+    google      = "~> 2.12.0"
+  }
 }
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+  required_providers {
+    google-beta = "~> 2.12.0"
+    google      = "~> 2.12.0"
+  }
 }
diff --git a/versions.tf b/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+  required_providers {
+    google-beta = "~> 2.12.0"
+    google      = "~> 2.12.0"
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,13 @@ resource "google_container_cluster" "primary" {`
`66`	`66`	`enabled = pod_security_policy_config.value.enabled`
`67`	`67`	`}`
`68`	`68`	`}`
	`69`	`+`
`69`	`70`	`dynamic "resource_usage_export_config" {`
`70`	`71`	`for_each = var.resource_usage_export_dataset_id != "" ? [var.resource_usage_export_dataset_id] : []`
`71`	`72`	`content {`
`72`	`73`	`enable_network_egress_metering = true`
`73`	`74`	`bigquery_destination {`
`74`		`- dataset_id = resource_usage_export_dataset_id.value`
	`75`	`+ dataset_id = resource_usage_export_config.value`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -361,6 +361,7 @@ variable "pod_security_policy_config" {`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`variable "resource_usage_export_dataset_id" {`
	`364`	`+ type = string`
`364`	`365`	`description = "The dataset id for which network egress metering for this cluster will be enabled. If enabled, a daemonset will be created in the cluster to meter network egress traffic."`
`365`	`366`	`default = ""`
`366`	`367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,8 @@`
`16`	`16`
`17`	`17`	`terraform {`
`18`	`18`	`required_version = ">= 0.12"`
	`19`	`+ required_providers {`
	`20`	`+ google-beta = "~> 2.12.0"`
	`21`	`+ google = "~> 2.12.0"`
	`22`	`+ }`
`19`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,11 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google" {`
`22`		`- version = "~> 2.12.0"`
`23`	`22`	`region = var.region`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`provider "google-beta" {`
`27`		`- version = "~> 2.12.0"`
`28`		`- region = var.region`
	`26`	`+ region = var.region`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`provider "kubernetes" {`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google-beta" {`
`22`		`- version = "~> 2.12.0"`
`23`		`- region = var.region`
	`22`	`+ region = var.region`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`data "google_compute_subnetwork" "subnetwork" {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google-beta" {`
`22`		`- version = "~> 2.12.0"`
`23`	`22`	`credentials = file(var.credentials_path)`
`24`	`23`	`region = var.region`
`25`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`provider "google-beta" {`
`18`		`- version = "~> 2.12.0"`
`19`		`- region = var.region`
	`18`	`+ region = var.region`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`provider "random" {`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,13 @@ resource "google_container_cluster" "primary" {`
`61`	`61`	`enabled = pod_security_policy_config.value.enabled`
`62`	`62`	`}`
`63`	`63`	`}`
	`64`	`+`
`64`	`65`	`dynamic "resource_usage_export_config" {`
`65`	`66`	`for_each = var.resource_usage_export_dataset_id != "" ? [var.resource_usage_export_dataset_id] : []`
`66`	`67`	`content {`
`67`	`68`	`enable_network_egress_metering = true`
`68`	`69`	`bigquery_destination {`
`69`		`- dataset_id = resource_usage_export_dataset_id.value`
	`70`	`+ dataset_id = resource_usage_export_config.value`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,7 @@ variable "pod_security_policy_config" {`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`variable "resource_usage_export_dataset_id" {`
	`361`	`+ type = string`
`361`	`362`	`description = "The dataset id for which network egress metering for this cluster will be enabled. If enabled, a daemonset will be created in the cluster to meter network egress traffic."`
`362`	`363`	`default = ""`
`363`	`364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,7 @@ variable "pod_security_policy_config" {`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`variable "resource_usage_export_dataset_id" {`
	`337`	`+ type = string`
`337`	`338`	`description = "The dataset id for which network egress metering for this cluster will be enabled. If enabled, a daemonset will be created in the cluster to meter network egress traffic."`
`338`	`339`	`default = ""`
`339`	`340`	`}`