Remove credentials_path and credentials_path_relative

terraform-google-modules · Mar 27, 2019 · ad75fbf · ad75fbf
1 parent 640de08
commit ad75fbf
Show file tree

Hide file tree

Showing 60 changed files with 43 additions and 457 deletions.
diff --git a/examples/deploy_service/README.md b/examples/deploy_service/README.md
@@ -10,40 +10,6 @@ It will:
 
 [^]: (autogen_docs_start)
 
-## Inputs
-
-| Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
-| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes |
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
-| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes |
-| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes |
-| network | The VPC network to host the cluster in | string | n/a | yes |
-| project\_id | The project ID to host the cluster in | string | n/a | yes |
-| region | The region to host the cluster in | string | n/a | yes |
-| subnetwork | The subnetwork to host the cluster in | string | n/a | yes |
-
-## Outputs
-
-| Name | Description |
-|------|-------------|
-| ca\_certificate |  |
-| client\_token |  |
-| cluster\_name | Cluster name |
-| credentials\_path |  |
-| ip\_range\_pods | The secondary IP range used for pods |
-| ip\_range\_services | The secondary IP range used for services |
-| kubernetes\_endpoint |  |
-| location |  |
-| master\_kubernetes\_version | The master Kubernetes version |
-| network |  |
-| project\_id |  |
-| region |  |
-| service\_account | The service account to default running nodes as if not overridden in `node_pools`. |
-| subnetwork |  |
-| zones | List of zones in which the cluster resides |
-
 [^]: (autogen_docs_end)
 
 To provision this example, run the following from within this directory:

diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -19,15 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 2.2"
-  credentials = "${file(var.credentials_path)}"
-  region      = "${var.region}"
+  version = "~> 2.2"
+  region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version     = "~> 2.2"
-  credentials = "${file(var.credentials_path)}"
-  region      = "${var.region}"
+  version = "~> 2.2"
+  region  = "${var.region}"
 }
 
 provider "kubernetes" {

diff --git a/examples/deploy_service/variables.tf b/examples/deploy_service/variables.tf
@@ -18,10 +18,6 @@ variable "project_id" {
   description = "The project ID to host the cluster in"
 }
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
-
 variable "cluster_name_suffix" {
   description = "A suffix to append to the default cluster name"
   default     = ""

diff --git a/examples/node_pool/README.md b/examples/node_pool/README.md
@@ -1,43 +1,24 @@
-# Node Pool Cluster
+# Project Cleanup Utility
 
-This example illustrates how to create a cluster with multiple custom node-pool configurations with node labels, taints, and network tags.
+This is a simple utility that scans a GCP organization for projects matching certain criteria, and enqueues such projects for deletion. Currently supported criteria are the combination of:
 
-[^]: (autogen_docs_start)
+- **Age:** Only projects older than the configured age, in hours, will be marked for deletion.
+- **Key-Value Pair:** Only projects whose labels contain the provided key-value pair will be marked for deletion.
 
-## Inputs
+## Environment Configuration
+
+The following environment variables may be specified to configure the cleanup utility:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
-| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes |
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
-| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes |
-| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes |
-| network | The VPC network to host the cluster in | string | n/a | yes |
-| project\_id | The project ID to host the cluster in | string | n/a | yes |
-| region | The region to host the cluster in | string | n/a | yes |
-| subnetwork | The subnetwork to host the cluster in | string | n/a | yes |
-| zones | The zone to host the cluster in (required if is a zonal cluster) | list | n/a | yes |
-
-## Outputs
-
-| Name | Description |
-|------|-------------|
-| ca\_certificate |  |
-| client\_token |  |
-| cluster\_name | Cluster name |
-| credentials\_path |  |
-| ip\_range\_pods | The secondary IP range used for pods |
-| ip\_range\_services | The secondary IP range used for services |
-| kubernetes\_endpoint |  |
-| location |  |
-| master\_kubernetes\_version | The master Kubernetes version |
-| network |  |
-| project\_id |  |
-| region |  |
-| service\_account | The service account to default running nodes as if not overridden in `node_pools`. |
-| subnetwork |  |
-| zones | List of zones in which the cluster resides |
+| `TARGET_TAG_NAME` | The tag name to match on for identifying projects to delete | string | n/a | yes |
+| `TARGET_TAG_VALUE` | The tag value to match on for identifying projects to delete | string | n/a | yes |
+| `MAX_PROJECT_AGE_HOURS` | The project age, in hours, at which point deletion should be considered | integer | n/a | yes |
+# Node Pool Cluster
+
+This example illustrates how to create a cluster with multiple custom node-pool configurations with node labels, taints, and network tags.
+
+[^]: (autogen_docs_start)
 
 [^]: (autogen_docs_end)
 

diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -19,15 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 2.2"
-  credentials = "${file(var.credentials_path)}"
-  region      = "${var.region}"
+  version = "~> 2.2"
+  region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version     = "~> 2.2"
-  credentials = "${file(var.credentials_path)}"
-  region      = "${var.region}"
+  version = "~> 2.2"
+  region  = "${var.region}"
 }
 
 module "gke" {

diff --git a/examples/node_pool/variables.tf b/examples/node_pool/variables.tf
@@ -18,10 +18,6 @@ variable "project_id" {
   description = "The project ID to host the cluster in"
 }
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
-
 variable "cluster_name_suffix" {
   description = "A suffix to append to the default cluster name"
   default     = ""

diff --git a/examples/shared_vpc/README.md b/examples/shared_vpc/README.md
@@ -4,41 +4,6 @@ This example illustrates how to create a simple cluster where the host network i
 
 [^]: (autogen_docs_start)
 
-## Inputs
-
-| Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
-| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes |
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
-| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes |
-| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes |
-| network | The VPC network to host the cluster in | string | n/a | yes |
-| network\_project\_id | The GCP project housing the VPC network to host the cluster in | string | n/a | yes |
-| project\_id | The project ID to host the cluster in | string | n/a | yes |
-| region | The region to host the cluster in | string | n/a | yes |
-| subnetwork | The subnetwork to host the cluster in | string | n/a | yes |
-
-## Outputs
-
-| Name | Description |
-|------|-------------|
-| ca\_certificate |  |
-| client\_token |  |
-| cluster\_name | Cluster name |
-| credentials\_path |  |
-| ip\_range\_pods | The secondary IP range used for pods |
-| ip\_range\_services | The secondary IP range used for services |
-| kubernetes\_endpoint |  |
-| location |  |
-| master\_kubernetes\_version | The master Kubernetes version |
-| network |  |
-| project\_id |  |
-| region |  |
-| service\_account | The service account to default running nodes as if not overridden in `node_pools`. |
-| subnetwork |  |
-| zones | List of zones in which the cluster resides |
-
 [^]: (autogen_docs_end)
 
 To provision this example, run the following from within this directory:

diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -19,15 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 2.2"
-  credentials = "${file(var.credentials_path)}"
-  region      = "${var.region}"
+  version = "~> 2.2"
+  region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version     = "~> 2.2"
-  credentials = "${file(var.credentials_path)}"
-  region      = "${var.region}"
+  version = "~> 2.2"
+  region  = "${var.region}"
 }
 
 module "gke" {

diff --git a/examples/shared_vpc/variables.tf b/examples/shared_vpc/variables.tf
@@ -18,10 +18,6 @@ variable "project_id" {
   description = "The project ID to host the cluster in"
 }
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
-
 variable "cluster_name_suffix" {
   description = "A suffix to append to the default cluster name"
   default     = ""

diff --git a/examples/simple_regional/README.md b/examples/simple_regional/README.md
@@ -4,40 +4,6 @@ This example illustrates how to create a simple cluster.
 
 [^]: (autogen_docs_start)
 
-## Inputs
-
-| Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
-| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes |
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
-| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes |
-| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes |
-| network | The VPC network to host the cluster in | string | n/a | yes |
-| project\_id | The project ID to host the cluster in | string | n/a | yes |
-| region | The region to host the cluster in | string | n/a | yes |
-| subnetwork | The subnetwork to host the cluster in | string | n/a | yes |
-
-## Outputs
-
-| Name | Description |
-|------|-------------|
-| ca\_certificate |  |
-| client\_token |  |
-| cluster\_name | Cluster name |
-| credentials\_path |  |
-| ip\_range\_pods | The secondary IP range used for pods |
-| ip\_range\_services | The secondary IP range used for services |
-| kubernetes\_endpoint |  |
-| location |  |
-| master\_kubernetes\_version | The master Kubernetes version |
-| network |  |
-| project\_id |  |
-| region |  |
-| service\_account | The service account to default running nodes as if not overridden in `node_pools`. |
-| subnetwork |  |
-| zones | List of zones in which the cluster resides |
-
 [^]: (autogen_docs_end)
 
 To provision this example, run the following from within this directory:

diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -19,15 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 2.2"
-  credentials = "${file(var.credentials_path)}"
-  region      = "${var.region}"
+  version = "~> 2.2"
+  region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version     = "~> 2.2"
-  credentials = "${file(var.credentials_path)}"
-  region      = "${var.region}"
+  version = "~> 2.2"
+  region  = "${var.region}"
 }
 
 module "gke" {

diff --git a/examples/simple_regional/variables.tf b/examples/simple_regional/variables.tf
@@ -18,10 +18,6 @@ variable "project_id" {
   description = "The project ID to host the cluster in"
 }
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
-
 variable "cluster_name_suffix" {
   description = "A suffix to append to the default cluster name"
   default     = ""

diff --git a/examples/simple_regional_private/README.md b/examples/simple_regional_private/README.md
@@ -4,40 +4,6 @@ This example illustrates how to create a simple private cluster.
 
 [^]: (autogen_docs_start)
 
-## Inputs
-
-| Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
-| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes |
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
-| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes |
-| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes |
-| network | The VPC network to host the cluster in | string | n/a | yes |
-| project\_id | The project ID to host the cluster in | string | n/a | yes |
-| region | The region to host the cluster in | string | n/a | yes |
-| subnetwork | The subnetwork to host the cluster in | string | n/a | yes |
-
-## Outputs
-
-| Name | Description |
-|------|-------------|
-| ca\_certificate |  |
-| client\_token |  |
-| cluster\_name | Cluster name |
-| credentials\_path |  |
-| ip\_range\_pods | The secondary IP range used for pods |
-| ip\_range\_services | The secondary IP range used for services |
-| kubernetes\_endpoint |  |
-| location |  |
-| master\_kubernetes\_version | The master Kubernetes version |
-| network |  |
-| project\_id |  |
-| region |  |
-| service\_account | The service account to default running nodes as if not overridden in `node_pools`. |
-| subnetwork |  |
-| zones | List of zones in which the cluster resides |
-
 [^]: (autogen_docs_end)
 
 To provision this example, run the following from within this directory:

diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
@@ -19,9 +19,8 @@ locals {
 }
 
 provider "google-beta" {
-  version     = "~> 2.2"
-  credentials = "${file(var.credentials_path)}"
-  region      = "${var.region}"
+  version = "~> 2.2"
+  region  = "${var.region}"
 }
 
 data "google_compute_subnetwork" "subnetwork" {

diff --git a/examples/simple_regional_private/variables.tf b/examples/simple_regional_private/variables.tf
@@ -18,10 +18,6 @@ variable "project_id" {
   description = "The project ID to host the cluster in"
 }
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
-
 variable "cluster_name_suffix" {
   description = "A suffix to append to the default cluster name"
   default     = ""