Added support for resource usage export config

* Based on PR terraform-google-modules#230 * Add support for beta feature resource_usage_export_config (Fixes terraform-google-modules#232) * Fixed `google-beta` provider version
paulpalamarchuk · Aug 21, 2019 · 2049805 · 2049805
1 parent 6ae2caa
commit 2049805
Show file tree

Hide file tree

Showing 30 changed files with 140 additions and 12 deletions.
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,7 +169,11 @@ 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
 
+<<<<<<< HEAD
 [#234]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/234
+=======
+[#238]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/238
+>>>>>>> Added support for resource usage export config
 [#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
 [#210]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/210

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.9.0"
+  }
 }
diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -19,13 +19,21 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+}
+
+provider "google-beta" {
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 provider "kubernetes" {

diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf
@@ -19,13 +19,21 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+}
+
+provider "google-beta" {
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 module "gke" {

diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -19,13 +19,21 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+}
+
+provider "google-beta" {
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 module "gke" {

diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -19,13 +19,21 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+}
+
+provider "google-beta" {
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 module "gke" {

diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -19,13 +19,21 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+}
+
+provider "google-beta" {
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 module "gke" {

diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf
@@ -19,13 +19,19 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version     = "~> 2.12.0"
+=======
+>>>>>>> Added support for resource usage export config
   credentials = file(var.credentials_path)
   region      = var.region
 }
 
 provider "google-beta" {
+<<<<<<< HEAD
   version     = "~> 2.12.0"
+=======
+>>>>>>> Added support for resource usage export config
   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,12 @@ locals {
 }
 
 provider "google-beta" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 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,10 @@ locals {
 }
 
 provider "google-beta" {
+<<<<<<< HEAD
   version     = "~> 2.12.0"
+=======
+>>>>>>> Added support for resource usage export config
   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,21 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+}
+
+provider "google-beta" {
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 module "gke" {

diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf
@@ -19,8 +19,12 @@ locals {
 }
 
 provider "google-beta" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 data "google_compute_subnetwork" "subnetwork" {

diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -19,13 +19,21 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+}
+
+provider "google-beta" {
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 module "gke" {

diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf
@@ -15,8 +15,12 @@
  */
 
 provider "google-beta" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 provider "random" {

diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf
@@ -19,13 +19,21 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+}
+
+provider "google-beta" {
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 module "gke" {

diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf
@@ -19,13 +19,21 @@ locals {
 }
 
 provider "google" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
 }
 
 provider "google-beta" {
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+}
+
+provider "google-beta" {
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 module "gke" {

diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf
@@ -19,8 +19,12 @@ locals {
 }
 
 provider "google-beta" {
+<<<<<<< HEAD
   version = "~> 2.12.0"
   region  = var.region
+=======
+  region = var.region
+>>>>>>> Added support for resource usage export config
 }
 
 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.9.0"
+  }
 }