Skip to content

Commit

Permalink
Added check for beta feature fields, as well as support for resource …
Browse files Browse the repository at this point in the history 
…usage export config

 * Based on PR #230
 * Add support for beta feature resource_usage_export_config (Fixes #232)
 * Fixed `google-beta` provider version
  • Loading branch information
@paulpalamarchuk
paulpalamarchuk committed Aug 19, 2019
1 parent 8a6c0e8 commit 48826ff
Show file tree
Hide file tree
Showing 20 changed files with 42 additions and 47 deletions.
4 changes: 4 additions & 0 deletions autogen/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@

terraform {
required_version = ">= 0.12"
required_providers {
google-beta = ">= 2.10.0"
google = ">= 2.9.0"
}
}
6 changes: 2 additions & 4 deletions examples/deploy_service/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "kubernetes" {
Expand Down
6 changes: 2 additions & 4 deletions examples/disable_client_cert/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

module "gke" {
Expand Down
6 changes: 2 additions & 4 deletions examples/node_pool/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

module "gke" {
Expand Down
6 changes: 2 additions & 4 deletions examples/shared_vpc/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

module "gke" {
Expand Down
6 changes: 2 additions & 4 deletions examples/simple_regional/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

module "gke" {
Expand Down
2 changes: 0 additions & 2 deletions examples/simple_regional_beta/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
credentials = file(var.credentials_path)
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
credentials = file(var.credentials_path)
region = var.region
}
Expand Down
3 changes: 1 addition & 2 deletions examples/simple_regional_private/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ locals {
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

data "google_compute_subnetwork" "subnetwork" {
Expand Down
1 change: 0 additions & 1 deletion examples/simple_regional_private_beta/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ locals {
}

provider "google-beta" {
version = "~> 2.9.0"
credentials = file(var.credentials_path)
region = var.region
}
Expand Down
6 changes: 2 additions & 4 deletions examples/simple_zonal/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

module "gke" {
Expand Down
3 changes: 1 addition & 2 deletions examples/simple_zonal_private/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ locals {
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

data "google_compute_subnetwork" "subnetwork" {
Expand Down
6 changes: 2 additions & 4 deletions examples/stub_domains/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

module "gke" {
Expand Down
3 changes: 1 addition & 2 deletions examples/stub_domains_private/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "random" {
Expand Down
6 changes: 2 additions & 4 deletions examples/stub_domains_upstream_nameservers/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

module "gke" {
Expand Down
6 changes: 2 additions & 4 deletions examples/upstream_nameservers/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ locals {
}

provider "google" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

module "gke" {
Expand Down
3 changes: 1 addition & 2 deletions examples/workload_metadata_config/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ locals {
}

provider "google-beta" {
version = "~> 2.9.0"
region = var.region
region = var.region
}

data "google_compute_subnetwork" "subnetwork" {
Expand Down
4 changes: 4 additions & 0 deletions modules/beta-private-cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@

terraform {
required_version = ">= 0.12"
required_providers {
google-beta = ">= 2.10.0"
google = ">= 2.9.0"
}
}
4 changes: 4 additions & 0 deletions modules/beta-public-cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@

terraform {
required_version = ">= 0.12"
required_providers {
google-beta = ">= 2.10.0"
google = ">= 2.9.0"
}
}
4 changes: 4 additions & 0 deletions modules/private-cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@

terraform {
required_version = ">= 0.12"
required_providers {
google-beta = ">= 2.10.0"
google = ">= 2.9.0"
}
}
4 changes: 4 additions & 0 deletions versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@

terraform {
required_version = ">= 0.12"
required_providers {
google-beta = ">= 2.10.0"
google = ">= 2.9.0"
}
}

0 comments on commit 48826ff

Please sign in to comment.