Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove credentials_path and credentials_path_relative #89

Merged
merged 5 commits into from
Mar 27, 2019
Merged

Remove credentials_path and credentials_path_relative #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad75fbf
Remove credentials_path and credentials_path_relative
Jberlinsky Mar 5, 2019
5e259cb
Regenerate READMEs
Jberlinsky Mar 27, 2019
2313634
Remove errant text from rebase gone wrong
Jberlinsky Mar 27, 2019
4e8b4b5
Run `make generate_docs` with `terraform-docs` 0.6.0
Jberlinsky Mar 27, 2019
fc43491
Merge branch 'master' into internal/remove-credentials-path
aaron-lane Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions examples/deploy_service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ It will:
|------|-------------|:----:|:-----:|:-----:|
| 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 |
Expand All @@ -31,7 +30,6 @@ It will:
| 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 | |
Expand Down
10 changes: 4 additions & 6 deletions examples/deploy_service/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 0 additions & 4 deletions examples/deploy_service/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/node_pool/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ This example illustrates how to create a cluster with multiple custom node-pool
|------|-------------|:----:|:-----:|:-----:|
| 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 |
Expand All @@ -26,7 +25,6 @@ This example illustrates how to create a cluster with multiple custom node-pool
| 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 | |
Expand Down
10 changes: 4 additions & 6 deletions examples/node_pool/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 0 additions & 4 deletions examples/node_pool/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/shared_vpc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ This example illustrates how to create a simple cluster where the host network i
|------|-------------|:----:|:-----:|:-----:|
| 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 |
Expand All @@ -26,7 +25,6 @@ This example illustrates how to create a simple cluster where the host network i
| 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 | |
Expand Down
10 changes: 4 additions & 6 deletions examples/shared_vpc/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 0 additions & 4 deletions examples/shared_vpc/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/simple_regional/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ This example illustrates how to create a simple cluster.
|------|-------------|:----:|:-----:|:-----:|
| 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 |
Expand All @@ -25,7 +24,6 @@ This example illustrates how to create a simple cluster.
| 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 | |
Expand Down
10 changes: 4 additions & 6 deletions examples/simple_regional/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 0 additions & 4 deletions examples/simple_regional/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/simple_regional_private/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ This example illustrates how to create a simple private cluster.
|------|-------------|:----:|:-----:|:-----:|
| 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 |
Expand All @@ -25,7 +24,6 @@ This example illustrates how to create a simple private cluster.
| 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 | |
Expand Down
5 changes: 2 additions & 3 deletions examples/simple_regional_private/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 0 additions & 4 deletions examples/simple_regional_private/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/simple_zonal/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ This example illustrates how to create a simple cluster.
| Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:|
| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
| 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 |
Expand All @@ -25,7 +24,6 @@ This example illustrates how to create a simple cluster.
| 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 | |
Expand Down
10 changes: 4 additions & 6 deletions examples/simple_zonal/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 0 additions & 4 deletions examples/simple_zonal/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/simple_zonal_private/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ This example illustrates how to create a simple private cluster.
|------|-------------|:----:|:-----:|:-----:|
| 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 |
Expand All @@ -26,7 +25,6 @@ This example illustrates how to create a simple private cluster.
| 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 | |
Expand Down
5 changes: 2 additions & 3 deletions examples/simple_zonal_private/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 0 additions & 4 deletions examples/simple_zonal_private/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/stub_domains/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ It will:
|------|-------------|:----:|:-----:|:-----:|
| 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 |
Expand All @@ -30,7 +29,6 @@ It will:
| 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 | |
Expand Down
10 changes: 4 additions & 6 deletions examples/stub_domains/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 0 additions & 4 deletions examples/stub_domains/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
4 changes: 0 additions & 4 deletions test/fixtures/all_examples/test_outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ output "project_id" {
value = "${var.project_id}"
}

output "credentials_path" {
value = "${var.credentials_path}"
}

output "region" {
value = "${module.gke.region}"
}
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/deploy_service/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module "example" {
source = "../../../examples/deploy_service"

project_id = "${var.project_id}"
credentials_path = "${local.credentials_path}"
cluster_name_suffix = "-${random_string.suffix.result}"
region = "${var.region}"
network = "${google_compute_network.main.name}"
Expand Down
5 changes: 0 additions & 5 deletions test/fixtures/deploy_service/network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,13 @@
* limitations under the License.
*/

locals {
credentials_path = "${path.module}/${var.credentials_path_relative}"
}

resource "random_string" "suffix" {
length = 4
special = false
upper = false
}

provider "google" {
credentials = "${file(local.credentials_path)}"
project = "${var.project_id}"
}

Expand Down